OSDN Git Service
Fred Chung [Thu, 17 Nov 2011 12:13:01 +0000 (04:13 -0800)]
am
d2789aa3: am
d592714d: am
15fe377c: Merge "Bluetooth HDP sample." into ics-mr1
* commit '
d2789aa322357ebb453bcad8825a33b27bb78c29':
Bluetooth HDP sample.
The Android Open Source Project [Thu, 17 Nov 2011 12:12:57 +0000 (04:12 -0800)]
Fred Chung [Thu, 17 Nov 2011 12:08:28 +0000 (04:08 -0800)]
am
d592714d: am
15fe377c: Merge "Bluetooth HDP sample." into ics-mr1
* commit '
d592714d9a48afce69d6904fc539f150b7c02898':
Bluetooth HDP sample.
The Android Open Source Project [Thu, 17 Nov 2011 12:08:27 +0000 (04:08 -0800)]
Steven Ross [Thu, 17 Nov 2011 01:49:02 +0000 (17:49 -0800)]
am
b076bfc5: Merge "Not showing facelock when plugging/unplugging fixes
5438524"
* commit '
b076bfc5e33ba9d234c874e3546b452d8410b668':
Not showing facelock when plugging/unplugging fixes
5438524
Steven Ross [Thu, 17 Nov 2011 01:46:44 +0000 (17:46 -0800)]
Merge "Not showing facelock when plugging/unplugging fixes
5438524"
Glenn Kasten [Wed, 16 Nov 2011 23:13:18 +0000 (15:13 -0800)]
am
3cce14e8: Merge "Bug
4903178 Restore priority and cgroup on stop"
* commit '
3cce14e8fff950f7e7c8b1649ad4ecbcdefedf6b':
Bug
4903178 Restore priority and cgroup on stop
Glenn Kasten [Wed, 16 Nov 2011 23:11:20 +0000 (15:11 -0800)]
Merge "Bug
4903178 Restore priority and cgroup on stop"
Glenn Kasten [Wed, 22 Jun 2011 23:15:25 +0000 (16:15 -0700)]
Bug
4903178 Restore priority and cgroup on stop
On AudioTrack and AudioRecord stop or failed start, restore the priority
and cgroup of the caller to their previous values, rather than forcing
to NORMAL. Dependent on new thread APIs.
Also fixes bug where priority was set to AUDIO but cgroup not set.
Change-Id: Ib83893918fb4fdf57c6b87884b51038997a631d8
Fred Quintana [Wed, 16 Nov 2011 20:48:24 +0000 (12:48 -0800)]
am
9a8f2b10: Merge "When in the Choose Account flow if the accounts list display was initially skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display."
* commit '
9a8f2b1057ce9c9c639d23fbf710aba639db4f7a':
When in the Choose Account flow if the accounts list display was initially skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display.
Fred Quintana [Wed, 16 Nov 2011 20:45:14 +0000 (12:45 -0800)]
Merge "When in the Choose Account flow if the accounts list display was initially skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display."
Alex Sakhartchouk [Wed, 16 Nov 2011 18:40:49 +0000 (10:40 -0800)]
am
5a471818: Merge "Expand RS vector3 types to vector4."
* commit '
5a4718183340a108b55eba7bf755b4432153caa1':
Expand RS vector3 types to vector4.
Alex Sakhartchouk [Wed, 16 Nov 2011 18:36:02 +0000 (10:36 -0800)]
Merge "Expand RS vector3 types to vector4."
Fred Chung [Wed, 16 Nov 2011 17:48:20 +0000 (09:48 -0800)]
am
15fe377c: Merge "Bluetooth HDP sample." into ics-mr1
* commit '
15fe377c7cb57c4d758edcfc1d1e53bcf5a0a8bc':
Bluetooth HDP sample.
The Android Open Source Project [Wed, 16 Nov 2011 17:48:16 +0000 (09:48 -0800)]
Fred Chung [Wed, 16 Nov 2011 17:31:54 +0000 (09:31 -0800)]
Merge "Bluetooth HDP sample." into ics-mr1
The Android Open Source Project [Wed, 16 Nov 2011 17:27:57 +0000 (09:27 -0800)]
No-op merge from ics-mr0
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
The Android Open Source Project [Wed, 16 Nov 2011 16:55:42 +0000 (08:55 -0800)]
Reconcile with ics-factoryrom-2-release
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
Steven Ross [Tue, 15 Nov 2011 18:59:35 +0000 (13:59 -0500)]
Not showing facelock when plugging/unplugging fixes
5438524
This will close down or prevent the start of FaceUnlock if
the device is plugged in or unplugged,
unless FaceUnlock is currently active.
Change-Id: I216831964472da47fb24644070d1717dffe1b7f7
The Android Open Source Project [Wed, 16 Nov 2011 15:45:51 +0000 (07:45 -0800)]
am
5cf2a139: am
c172688d: (-s ours) am
c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
5cf2a1399e8cd047e84e159e25c74c259882f52c':
Fix bug in TextLayoutCacheKey handling embedded nulls.
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
The Android Open Source Project [Wed, 16 Nov 2011 15:42:14 +0000 (07:42 -0800)]
am
c172688d: (-s ours) am
c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
c172688d5e9a1d26e2792297939cbb7bd93acaf2':
Fix bug in TextLayoutCacheKey handling embedded nulls.
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
The Android Open Source Project [Wed, 16 Nov 2011 15:38:11 +0000 (07:38 -0800)]
am
c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
c7403258528a08ab74f7c29277d0c34ba6edc53d':
Fix bug in TextLayoutCacheKey handling embedded nulls.
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
The Android Open Source Project [Wed, 16 Nov 2011 15:33:58 +0000 (07:33 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I8f772da03379c9d701c4eefaf58897497a83a4d3
Steve Block [Wed, 16 Nov 2011 14:32:41 +0000 (06:32 -0800)]
am
862c2f52: Merge changes I2c304952,Ic04bbd69,Ibbac2268
* commit '
862c2f5275cb6e8baed5c53d3f2742740f8909a8':
Update Java Bridge test for coercing JavaScript String to Java char in an array
Add tests for multidimensional arrays in WebView's Java Bridge
Fix tests for methods returning arrays in WebView's Java Bridge
Steve Block [Wed, 16 Nov 2011 14:30:55 +0000 (06:30 -0800)]
Merge changes I2c304952,Ic04bbd69,Ibbac2268
* changes:
Update Java Bridge test for coercing JavaScript String to Java char in an array
Add tests for multidimensional arrays in WebView's Java Bridge
Fix tests for methods returning arrays in WebView's Java Bridge
Steve Block [Tue, 15 Nov 2011 18:07:34 +0000 (18:07 +0000)]
Update Java Bridge test for coercing JavaScript String to Java char in an array
See https://android-git.corp.google.com/g/150052
Bug:
5619677
Change-Id: I2c3049529312b38bd3731dfc79b14edcb8cd6357
Steve Block [Mon, 14 Nov 2011 18:26:03 +0000 (18:26 +0000)]
Add tests for multidimensional arrays in WebView's Java Bridge
Also add a test for objects with a non-numeric length property being passed to
a method expecting an array.
Change-Id: Ic04bbd691c55744472cab9fb732e504997c62434
Steve Block [Wed, 16 Nov 2011 14:26:59 +0000 (06:26 -0800)]
am
45047a11: Merge "Add tests for invalid and static methods in the WebView\'s Java Bridge"
* commit '
45047a11ae85361a40082ba41ee9b8fa19f3e039':
Add tests for invalid and static methods in the WebView's Java Bridge
Steve Block [Mon, 14 Nov 2011 18:07:35 +0000 (18:07 +0000)]
Fix tests for methods returning arrays in WebView's Java Bridge
Change-Id: Ibbac2268307fbfcff09a2d3b0f841ce420edc416
Steve Block [Wed, 16 Nov 2011 14:24:14 +0000 (06:24 -0800)]
Merge "Add tests for invalid and static methods in the WebView's Java Bridge"
Jake Hamby [Wed, 16 Nov 2011 04:27:11 +0000 (20:27 -0800)]
am
ac62c901: am
0f2dec50: am
bd783684: am
7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '
ac62c901b719157c49600fece23a1e29a75585e1':
Fix 3GPP SMS send failure for 7-bit national language tables.
Bill Gruber [Wed, 16 Nov 2011 04:27:10 +0000 (20:27 -0800)]
am
566e594e: am
df1aba0a: am
c7b35481: am
c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug
5221766" into ics-mr0
* commit '
566e594e7e49fb7afb4eb0bb54cc896126c5e73e':
IAB Doc Fix: Error in code snippet Bug
5221766
Adrian Ludwig [Wed, 16 Nov 2011 04:27:08 +0000 (20:27 -0800)]
am
0ebffbc6: am
7456cf0a: am
cbc96549: am
0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '
0ebffbc66d7099ea5a52faf060bb790572a4eec4':
Adding new "Security Best Practices" to the html docs.
Jake Hamby [Wed, 16 Nov 2011 04:24:45 +0000 (20:24 -0800)]
am
0f2dec50: am
bd783684: am
7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '
0f2dec5033919fab77a2b52bb3cf33cf4975f2c9':
Fix 3GPP SMS send failure for 7-bit national language tables.
Bill Gruber [Wed, 16 Nov 2011 04:24:42 +0000 (20:24 -0800)]
am
df1aba0a: am
c7b35481: am
c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug
5221766" into ics-mr0
* commit '
df1aba0a9d25a0f9d38593d369ba963dfcd45866':
IAB Doc Fix: Error in code snippet Bug
5221766
James Dong [Wed, 16 Nov 2011 04:24:38 +0000 (20:24 -0800)]
am
0e7d85fa: am
4e72e2bf: am
4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
* commit '
0e7d85fa93a5f5975b437277439b3c65f86cf275':
Document that release() should be called with onPause() and onStop() for media objects
Adrian Ludwig [Wed, 16 Nov 2011 04:24:38 +0000 (20:24 -0800)]
am
7456cf0a: am
cbc96549: am
0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '
7456cf0a125b47860a43d9915bae69b5ef374703':
Adding new "Security Best Practices" to the html docs.
James Dong [Wed, 16 Nov 2011 04:19:55 +0000 (20:19 -0800)]
am
4e72e2bf: am
4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
* commit '
4e72e2bfc24afe053ca98c6de2591a4057cfd9fa':
Document that release() should be called with onPause() and onStop() for media objects
Jake Hamby [Wed, 16 Nov 2011 04:19:34 +0000 (20:19 -0800)]
am
bd783684: am
7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '
bd7836846c1e5d3610ba6c26686674d429a4316c':
Fix 3GPP SMS send failure for 7-bit national language tables.
Bill Gruber [Wed, 16 Nov 2011 04:19:33 +0000 (20:19 -0800)]
am
c7b35481: am
c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug
5221766" into ics-mr0
* commit '
c7b354810e9caebe1d4c79d8a2e756f3c194e68f':
IAB Doc Fix: Error in code snippet Bug
5221766
Adrian Ludwig [Wed, 16 Nov 2011 04:19:30 +0000 (20:19 -0800)]
am
cbc96549: am
0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '
cbc96549c9c9a0a4f0bc8ccab1c044c71eba303b':
Adding new "Security Best Practices" to the html docs.
James Dong [Wed, 16 Nov 2011 04:16:47 +0000 (20:16 -0800)]
am
4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
* commit '
4fdc36e6d6003cdce911678f0b233697554f8dbf':
Document that release() should be called with onPause() and onStop() for media objects
Jake Hamby [Wed, 16 Nov 2011 04:16:12 +0000 (20:16 -0800)]
am
7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '
7d4046e9b7b95e1d5de12a54109b44d8305a6fdc':
Fix 3GPP SMS send failure for 7-bit national language tables.
Bill Gruber [Wed, 16 Nov 2011 04:16:02 +0000 (20:16 -0800)]
am
c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug
5221766" into ics-mr0
* commit '
c3cf16d2b4ae011c3e6408e0fb21f2377669ac4b':
IAB Doc Fix: Error in code snippet Bug
5221766
Adrian Ludwig [Wed, 16 Nov 2011 04:15:57 +0000 (20:15 -0800)]
am
0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '
0fd69ff4b9311c6b5406b769d50c9aa22787b816':
Adding new "Security Best Practices" to the html docs.
James Dong [Wed, 16 Nov 2011 04:13:03 +0000 (20:13 -0800)]
Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
Adam Powell [Wed, 16 Nov 2011 03:58:04 +0000 (19:58 -0800)]
am
ca127baa: am
868933e0: am
45f05c95: Merge "Fix bug
5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
* commit '
ca127baa0675bc1168019fbb1f9812dbbe4613d7':
Fix bug
5623642 - Status bar background incompatible with some legacy apps
Adam Powell [Wed, 16 Nov 2011 03:56:09 +0000 (19:56 -0800)]
am
868933e0: am
45f05c95: Merge "Fix bug
5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
* commit '
868933e0e43faca442bc8d319898201b233cfb94':
Fix bug
5623642 - Status bar background incompatible with some legacy apps
Adam Powell [Wed, 16 Nov 2011 03:54:04 +0000 (19:54 -0800)]
am
45f05c95: Merge "Fix bug
5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
* commit '
45f05c9580739ffe2d665cec50efb0bb57d757ba':
Fix bug
5623642 - Status bar background incompatible with some legacy apps
Adam Powell [Wed, 16 Nov 2011 03:51:56 +0000 (19:51 -0800)]
Merge "Fix bug
5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
Jeff Brown [Wed, 16 Nov 2011 03:46:40 +0000 (19:46 -0800)]
am
221096fd: am
4c0e0dd2: am
3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1
* commit '
221096fdd6963a0f7090b928cfb92b9267f32d7a':
Eliminate hw.keyboards system properties.
Dianne Hackborn [Wed, 16 Nov 2011 03:46:38 +0000 (19:46 -0800)]
am
8e56e1f3: am
cbcf8259: am
cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1
* commit '
8e56e1f3459703a9b9f5a13676428eeda68bb73f':
Whoops, need to acquire lock.
Jeff Brown [Wed, 16 Nov 2011 03:43:35 +0000 (19:43 -0800)]
am
4c0e0dd2: am
3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1
* commit '
4c0e0dd29dcce33e7521b11d01d21d9431f3b264':
Eliminate hw.keyboards system properties.
Dianne Hackborn [Wed, 16 Nov 2011 03:43:32 +0000 (19:43 -0800)]
am
cbcf8259: am
cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1
* commit '
cbcf8259697d2cb9025657a88e01cbb84be11d70':
Whoops, need to acquire lock.
Jeff Brown [Wed, 16 Nov 2011 03:19:04 +0000 (19:19 -0800)]
am
3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1
* commit '
3e7497b4eccd3db1d6ff0ce1f1f2db11f9a8eeef':
Eliminate hw.keyboards system properties.
Jeff Brown [Wed, 16 Nov 2011 03:17:09 +0000 (19:17 -0800)]
Merge "Eliminate hw.keyboards system properties." into ics-mr1
The Android Automerger [Wed, 16 Nov 2011 03:08:44 +0000 (19:08 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Dianne Hackborn [Wed, 16 Nov 2011 03:06:20 +0000 (19:06 -0800)]
am
cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1
* commit '
cdec187a27b2acc34cd4df26b836b83362527d6a':
Whoops, need to acquire lock.
Adam Powell [Wed, 16 Nov 2011 02:59:36 +0000 (18:59 -0800)]
Fix bug
5623642 - Status bar background incompatible with some legacy apps
Give some background protection to custom layouts in legacy notifications.
Pre-HC it was extremely common for apps to hardcode text colors in
layouts. Since this can lead to black text on a dark background in
HC/ICS, give these older apps that target SDK < 11 a light gray
background.
Change-Id: Iab3dea4beb9172b2f9a5cae53991cf952d0c8cde
Dianne Hackborn [Wed, 16 Nov 2011 03:04:11 +0000 (19:04 -0800)]
Merge "Whoops, need to acquire lock." into ics-mr1
Jean-Michel Trivi [Wed, 16 Nov 2011 02:33:49 +0000 (18:33 -0800)]
am
29270da5: am
4978c1a5: am
0ddb0143: Merge "Fix
5623252 unlink to death of audio focus client early" into ics-mr1
* commit '
29270da5f7dee7e81b9d69446c7d2030aea6ff74':
Fix
5623252 unlink to death of audio focus client early
Mathias Agopian [Wed, 16 Nov 2011 02:29:53 +0000 (18:29 -0800)]
am
dff37bc6: am
bc1b7f04: am
c0fa2a3b: Merge "rework a bit how we manage EGL extensions" into ics-mr1
* commit '
dff37bc674310beeb2aaf296130b8bbaa0e2ead2':
rework a bit how we manage EGL extensions
Jim Miller [Wed, 16 Nov 2011 02:29:46 +0000 (18:29 -0800)]
am
953b299d: am
58c6f1b2: am
c57bfa4a: Fix
5581164: Add abbreviated localized date strings
* commit '
953b299d36f1fe019908affa02271594bd17887f':
Fix
5581164: Add abbreviated localized date strings
Jim Miller [Wed, 16 Nov 2011 02:29:40 +0000 (18:29 -0800)]
am
057d4814: am
8622fb34: am
34a62348: Merge "Fix
5581164: Use abbreviated day in lockscreen" into ics-mr1
* commit '
057d48147a186918061d64875808692796c12005':
Fix
5581164: Use abbreviated day in lockscreen
Jean-Michel Trivi [Wed, 16 Nov 2011 02:28:39 +0000 (18:28 -0800)]
am
4978c1a5: am
0ddb0143: Merge "Fix
5623252 unlink to death of audio focus client early" into ics-mr1
* commit '
4978c1a5b07782d622ca9e3eedd649a5927d226f':
Fix
5623252 unlink to death of audio focus client early
Mathias Agopian [Wed, 16 Nov 2011 02:25:30 +0000 (18:25 -0800)]
am
bc1b7f04: am
c0fa2a3b: Merge "rework a bit how we manage EGL extensions" into ics-mr1
* commit '
bc1b7f0481f9bfa0e9feff0b43e48f9f171e0c38':
rework a bit how we manage EGL extensions
Jim Miller [Wed, 16 Nov 2011 02:25:12 +0000 (18:25 -0800)]
am
58c6f1b2: am
c57bfa4a: Fix
5581164: Add abbreviated localized date strings
* commit '
58c6f1b2e1528cd14bef94ae9c5b922b7751309c':
Fix
5581164: Add abbreviated localized date strings
Jim Miller [Wed, 16 Nov 2011 02:25:08 +0000 (18:25 -0800)]
am
8622fb34: am
34a62348: Merge "Fix
5581164: Use abbreviated day in lockscreen" into ics-mr1
* commit '
8622fb34769dc257a319ce8e7dab652312d6c049':
Fix
5581164: Use abbreviated day in lockscreen
Jean-Michel Trivi [Wed, 16 Nov 2011 02:21:44 +0000 (18:21 -0800)]
am
0ddb0143: Merge "Fix
5623252 unlink to death of audio focus client early" into ics-mr1
* commit '
0ddb0143895b816d4ff5c174b346390e07f26556':
Fix
5623252 unlink to death of audio focus client early
Jean-Michel Trivi [Wed, 16 Nov 2011 02:19:34 +0000 (18:19 -0800)]
Merge "Fix
5623252 unlink to death of audio focus client early" into ics-mr1
Mathias Agopian [Wed, 16 Nov 2011 02:15:18 +0000 (18:15 -0800)]
am
c0fa2a3b: Merge "rework a bit how we manage EGL extensions" into ics-mr1
* commit '
c0fa2a3bce40d52c0f1cccd87f8b0816a6faa6a7':
rework a bit how we manage EGL extensions
Mathias Agopian [Wed, 16 Nov 2011 02:12:00 +0000 (18:12 -0800)]
Merge "rework a bit how we manage EGL extensions" into ics-mr1
James Dong [Tue, 15 Nov 2011 03:01:26 +0000 (19:01 -0800)]
Document that release() should be called with onPause() and onStop() for media objects
Change-Id: I12dd734b4314df4f0573ad56a1714348e50da05e
related-to-bug:
5616833
Jeff Brown [Wed, 16 Nov 2011 01:48:10 +0000 (17:48 -0800)]
Eliminate hw.keyboards system properties.
Stop using system properties to publish information about
the key character map path. Instead, we can retrieve it
on demand by asking the window manager.
It was possible to exhaust the supply of system properties
when repeatedly adding and removing input devices.
Bug:
5532806
Change-Id: Idd361a24ad7db2edc185c8546db7fb05f9c28669
Jean-Michel Trivi [Wed, 16 Nov 2011 00:27:05 +0000 (16:27 -0800)]
Fix
5623252 unlink to death of audio focus client early
When removing an entry in the audio focus stack, don't wait for
this object's finalizer to unlink to the death of the associated
client, and unlink right away.
The FocusStackEntry.unlinkToDeath() method is made safe to call
by catching the exception it can throw inside its body.
Change-Id: Id347a933d72dcb41531adff2854fb00277032cc9
Fred Quintana [Wed, 16 Nov 2011 01:33:08 +0000 (17:33 -0800)]
When in the Choose Account flow if the accounts list display was initially
skipped if the user cancels out of adding an account the flow itself should
be canceled rather than showing the accounts list display.
Bug:
5599693
Change-Id: I5075e86656e237dddcb5e1d76e432e1cf525ab79
Steven Ross [Wed, 16 Nov 2011 01:20:49 +0000 (17:20 -0800)]
am
f6cf6de2: Merge "No blackscreen when dialog is showing fixes
5511992"
* commit '
f6cf6de27a20f2d7a996281d15b52e9ecb97751b':
No blackscreen when dialog is showing fixes
5511992
Steven Ross [Wed, 16 Nov 2011 01:18:39 +0000 (17:18 -0800)]
Merge "No blackscreen when dialog is showing fixes
5511992"
Jim Miller [Wed, 16 Nov 2011 00:18:32 +0000 (16:18 -0800)]
am
c57bfa4a: Fix
5581164: Add abbreviated localized date strings
* commit '
c57bfa4a4bf4c810b5c663df17443463d8192e8f':
Fix
5581164: Add abbreviated localized date strings
Dianne Hackborn [Tue, 15 Nov 2011 23:01:14 +0000 (15:01 -0800)]
Whoops, need to acquire lock.
Also increase time between reports to try to reduce the amount
of redundant spam we get.
Change-Id: Iedd7d743826fffa62ee431073cb7dfb49a00cea0
Jim Miller [Wed, 16 Nov 2011 00:06:37 +0000 (16:06 -0800)]
Fix
5581164: Add abbreviated localized date strings
Change-Id: I041eef02a67980d3b5c2f2fa12eae717c26e35be
Jim Miller [Tue, 15 Nov 2011 23:44:17 +0000 (15:44 -0800)]
am
34a62348: Merge "Fix
5581164: Use abbreviated day in lockscreen" into ics-mr1
* commit '
34a62348be92034a9fb7582e51754224785568dc':
Fix
5581164: Use abbreviated day in lockscreen
Jim Miller [Tue, 15 Nov 2011 23:42:20 +0000 (15:42 -0800)]
Merge "Fix
5581164: Use abbreviated day in lockscreen" into ics-mr1
Glenn Kasten [Tue, 15 Nov 2011 23:27:06 +0000 (15:27 -0800)]
am
2c42edf3: Merge "Remove obsolete NativeWindow_fromSurfaceTexture"
* commit '
2c42edf3c04cd6bc11021394f5612827b835a812':
Remove obsolete NativeWindow_fromSurfaceTexture
Glenn Kasten [Tue, 15 Nov 2011 23:25:38 +0000 (15:25 -0800)]
Merge "Remove obsolete NativeWindow_fromSurfaceTexture"
Alex Sakhartchouk [Tue, 15 Nov 2011 23:15:21 +0000 (15:15 -0800)]
Expand RS vector3 types to vector4.
BUG=
5609007
The underlying LLVM implementation for vector3 types does this implicitly. If
RS does not adjust its implementation, we will always be misaligned for any
subsequent data after a vector3 type. We previously inserted padding into the
reflected layers from llvm-rs-cc (hence the skip padding part of this change).
We can safely ignore the padding now that the Java/native code is updated to
use the expanded size. The compiler will also need modification to ensure that
we don't mistakenly skip over any end-of-struct padding.
Fixing the 3 component vector padding problem.
Change-Id: If68af42287deb8f4b28addcd19a9fa314656be44
Tsu Chiang Chuang [Tue, 15 Nov 2011 23:12:32 +0000 (15:12 -0800)]
am
6a24bb3e: am
c558a159: am
cce32110: am
d5897dc7: fix for build breakage.
* commit '
6a24bb3ec86b85a4b4a41d28fa49850a3e57cdea':
fix for build breakage.
Tsu Chiang Chuang [Tue, 15 Nov 2011 23:10:00 +0000 (15:10 -0800)]
am
c558a159: am
cce32110: am
d5897dc7: fix for build breakage.
* commit '
c558a15931324f06af23c2c1711b4375e15d45e3':
fix for build breakage.
Tsu Chiang Chuang [Tue, 15 Nov 2011 23:05:24 +0000 (15:05 -0800)]
am
cce32110: am
d5897dc7: fix for build breakage.
* commit '
cce32110e6f42378a76e0eb2495d24b6c8bc8ae7':
fix for build breakage.
Jim Miller [Tue, 15 Nov 2011 23:02:25 +0000 (15:02 -0800)]
am
066d088c: am
390811b8: am
b35a21f9: Merge "Fix
5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1
* commit '
066d088cce115448db85b55e8333262be85899cd':
Fix
5602985: Show "Emergency calls only" when device has no SIM.
Tsu Chiang Chuang [Tue, 15 Nov 2011 23:00:26 +0000 (15:00 -0800)]
am
d5897dc7: fix for build breakage.
* commit '
d5897dc7985e511c194f839d4b340fed2d63b41c':
fix for build breakage.
Jim Miller [Tue, 15 Nov 2011 22:59:07 +0000 (14:59 -0800)]
am
390811b8: am
b35a21f9: Merge "Fix
5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1
* commit '
390811b8a4a08703b32d4d36bc6997798b52d341':
Fix
5602985: Show "Emergency calls only" when device has no SIM.
Jim Miller [Tue, 15 Nov 2011 22:54:50 +0000 (14:54 -0800)]
am
b35a21f9: Merge "Fix
5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1
* commit '
b35a21f987b99cfe90f4c46e0a708703274b8f46':
Fix
5602985: Show "Emergency calls only" when device has no SIM.
Jeff Brown [Tue, 15 Nov 2011 22:54:19 +0000 (14:54 -0800)]
am
96af5a05: am
d3b98329: am
d5713179: Merge "Override app requested orientation when docked." into ics-mr1
* commit '
96af5a054d94fb02dbc3614f37e12619d31254ae':
Override app requested orientation when docked.
Jim Miller [Tue, 15 Nov 2011 22:51:50 +0000 (14:51 -0800)]
Merge "Fix
5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1
Jeff Brown [Tue, 15 Nov 2011 22:51:08 +0000 (14:51 -0800)]
am
d3b98329: am
d5713179: Merge "Override app requested orientation when docked." into ics-mr1
* commit '
d3b98329636ad089bb0b14cefa4b49d32e5ec678':
Override app requested orientation when docked.
Jeff Brown [Tue, 15 Nov 2011 22:48:25 +0000 (14:48 -0800)]
am
d5713179: Merge "Override app requested orientation when docked." into ics-mr1
* commit '
d5713179a0f68aa47a8cd966abc5324d43414b63':
Override app requested orientation when docked.
Dianne Hackborn [Tue, 15 Nov 2011 22:47:01 +0000 (14:47 -0800)]
am
9864e0d8: am
d9070a08: am
5f11d73c: Merge "Improve low memory dropbox reporting." into ics-mr1
* commit '
9864e0d81f2e3f28170b3c82fcf30d9c24ccbeae':
Improve low memory dropbox reporting.
Jeff Brown [Tue, 15 Nov 2011 22:46:17 +0000 (14:46 -0800)]
Merge "Override app requested orientation when docked." into ics-mr1
Dianne Hackborn [Tue, 15 Nov 2011 22:44:54 +0000 (14:44 -0800)]
am
d9070a08: am
5f11d73c: Merge "Improve low memory dropbox reporting." into ics-mr1
* commit '
d9070a08807ee119d9d73052cc1ad1f1b29eb13d':
Improve low memory dropbox reporting.