Tsu Chiang Chuang
c558a15931
am cce32110: am d5897dc7: fix for build breakage.
...
* commit 'cce32110e6f42378a76e0eb2495d24b6c8bc8ae7':
fix for build breakage.
2011-11-15 15:05:24 -08:00
Tsu Chiang Chuang
cce32110e6
am d5897dc7: fix for build breakage.
...
* commit 'd5897dc7985e511c194f839d4b340fed2d63b41c':
fix for build breakage.
2011-11-15 15:00:26 -08:00
Jim Miller
390811b8a4
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.
2011-11-15 14:54:50 -08:00
Jim Miller
b35a21f987
Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1
2011-11-15 14:51:50 -08:00
Jeff Brown
d3b9832963
am d5713179: Merge "Override app requested orientation when docked." into ics-mr1
...
* commit 'd5713179a0f68aa47a8cd966abc5324d43414b63':
Override app requested orientation when docked.
2011-11-15 14:48:25 -08:00
Jeff Brown
d5713179a0
Merge "Override app requested orientation when docked." into ics-mr1
2011-11-15 14:46:17 -08:00
Dianne Hackborn
d9070a0880
am 5f11d73c: Merge "Improve low memory dropbox reporting." into ics-mr1
...
* commit '5f11d73c918de72368ac5605c50f5fb9ac0457cb':
Improve low memory dropbox reporting.
2011-11-15 14:42:11 -08:00
Dianne Hackborn
5f11d73c91
Merge "Improve low memory dropbox reporting." into ics-mr1
2011-11-15 14:39:37 -08:00
Alex Sakhartchouk
38da5086a6
Followup to a bug fix.
...
Addtion of synchronized to the methods triggers an API change.
Per council advice, pushing synch block into the function body.
Change-Id: Iaa395d9720bce499259ab750fe97149715e9f271
2011-11-15 14:21:58 -08:00
Dianne Hackborn
d8c98fee02
Improve low memory dropbox reporting.
...
The msg is now constructed to try to bin these reports in
interesting ways. We'll see. Also change the tag name from
watchdog to lowmem, since sharkey is kindly taking care of
the back-end to handle this.
Improve how we put processes into low memory states to better
poke things like home and the previous app.
Also clean up some debug output, and add a few new am comment
options for controlling the current debug app.
Change-Id: I562a931a95244a2727bb7a6e1fd80dec259cdae2
2011-11-15 14:15:58 -08:00
Jeff Brown
dec6cf4f30
Override app requested orientation when docked.
...
Applies to docks, lid switch, HDMI and rotation lock.
We always choose a mode that is compatible with the application's
request, so if in a landscape dock, we might override a request
for seascape but we leave requests for portrait alone.
Bug: 5620454
Change-Id: Ib0c4f60f7f9e3aeafaba9c717233a950fccb8af2
2011-11-15 14:14:02 -08:00
Jake Hamby
7d4046e9b7
Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
2011-11-15 13:34:58 -08:00
Mathias Agopian
556a406cf4
am 3aa684ec: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
...
* commit '3aa684ec0d3f70027fa808fb95b096a1613a1ddc':
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
2011-11-15 13:06:08 -08:00
Mathias Agopian
a0d32c4d09
am 6b3ce09d: Merge "fix crash when validating an invalid EGL objects" into ics-mr1
...
* commit '6b3ce09d37fdb53a3a32e688017a5b343398c03b':
fix crash when validating an invalid EGL objects
2011-11-15 13:06:06 -08:00
Mathias Agopian
3aa684ec0d
Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
2011-11-15 13:03:47 -08:00
Mathias Agopian
6b3ce09d37
Merge "fix crash when validating an invalid EGL objects" into ics-mr1
2011-11-15 13:03:22 -08:00
Winson Chung
9ebb030ad9
am e5129d7f: Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1
...
* commit 'e5129d7f49361df69e804a79696e28b213ea20b0':
Defer adding large icon until when we compose the final notification. (Bug 5566846)
2011-11-15 12:45:18 -08:00
Winson Chung
e5129d7f49
Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1
2011-11-15 12:41:56 -08:00
Danielle Millett
8b6b92ea5e
am 49000016: am 8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0
...
* commit '4900001670c5229fa06e57821a3436023c25520d':
DO NOT MERGE cherry picking from MR0 cl 148223
2011-11-15 12:21:01 -08:00
Danielle Millett
4900001670
am 8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0
...
* commit '8d8e669ea11d011b3e2320ad5dab580916b6d32e':
DO NOT MERGE cherry picking from MR0 cl 148223
2011-11-15 12:16:59 -08:00
Eric Fischer
66adcedbc6
am 3524831a: am 8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '3524831a633693cf72880299706b2039d41c3b78':
Import revised translations. DO NOT MERGE
2011-11-15 11:55:54 -08:00
Eric Fischer
3524831a63
am 8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '8d00c194c228e67851e5a0cb75c4bf4d99dd40f0':
Import revised translations. DO NOT MERGE
2011-11-15 11:51:38 -08:00
Sunita Nadampalli
f1e868f682
SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
...
Surface Texture dequeue logic is modified to return the oldest of the
free buffers to Client on dequeue call.
Currently dequeue method is returning the first buffer index which is free.
The parsing is done in ascending order of the buffer slot indices.
This leads to returning the buffer which has been just queued to composer,
and hence display, and this defeats the purpose of having minimum dequeue count
as 2 in asynchrnouse mode.
This is fixed by checking all the free slots and returning the oldest buffer.
Change-Id: Ibbac10593c3994c278c601af0480b171635ecdd4
Signed-off-by: Sunita Nadampalli <sunitan@ti.com>
2011-11-15 11:43:35 -08:00
Tsu Chiang Chuang
06e4a40017
am b3f2890a: am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0
...
* commit 'b3f2890a8af3a99be1b0d5fd5a40df656cb60598':
Adding mobile microbenchmark tests.
2011-11-15 11:13:45 -08:00
Tsu Chiang Chuang
b3f2890a8a
am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0
...
* commit '047c4de2c548960fff428a92099003593cede5f8':
Adding mobile microbenchmark tests.
2011-11-15 11:10:44 -08:00
Bill Gruber
c3cf16d2b4
Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0
2011-11-15 10:57:32 -08:00
Adrian Ludwig
0fd69ff4b9
Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
2011-11-15 10:37:28 -08:00
Gilles Debunne
7bc6600e60
am 8a440477: Merge "Clean-up in TextView" into ics-mr1
...
* commit '8a440477fd203d74b73b32dc2b357f07dfc36067':
Clean-up in TextView
2011-11-15 10:02:15 -08:00
Gilles Debunne
8a440477fd
Merge "Clean-up in TextView" into ics-mr1
2011-11-15 09:59:45 -08:00
John Reck
6a622c5608
am a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1
...
* commit 'a0c6bf5af6af4b0fd59347b78d3a507c416a46e6':
Call onScrollChanged when scrolling layers
2011-11-15 09:58:48 -08:00
John Reck
a0c6bf5af6
Merge "Call onScrollChanged when scrolling layers" into ics-mr1
2011-11-15 09:56:17 -08:00
Hong Teng
716747f7cb
am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
...
* commit '481ffa505bb1d8f5089ea98e3b5960d409b6819c':
Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
2011-11-15 09:45:29 -08:00
Hong Teng
481ffa505b
Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
2011-11-15 09:42:37 -08:00
Daniel Sandler
50fb8a29f0
am ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1
...
* commit 'ce33622aed7fb25a14ef957cdc78b78cc4602be9':
Bring back the 'more notifications' icon.
2011-11-15 09:22:40 -08:00
Daniel Sandler
ce33622aed
Merge "Bring back the 'more notifications' icon." into ics-mr1
2011-11-15 09:20:56 -08:00
Jean-Michel Trivi
87597d9ce0
am 538dc6ac: Merge "Fix 5615747 Don\'t leak remote control client death handlers" into ics-mr1
...
* commit '538dc6acfd14ea59f0b294531f9417ca04ca621f':
Fix 5615747 Don't leak remote control client death handlers
2011-11-15 08:58:55 -08:00
Jean-Michel Trivi
538dc6acfd
Merge "Fix 5615747 Don't leak remote control client death handlers" into ics-mr1
2011-11-15 08:56:55 -08:00
Bill Gruber
afc270bb75
IAB Doc Fix: Error in code snippet
...
Bug 5221766
Change-Id: I7af624ed69526b545c97d1419e08f60c92b79d8e
2011-11-15 07:18:30 -08:00
Wu-cheng Li
4e1fed76c1
am b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1
...
* commit 'b90a70d1542edd5a95e73b75192e6eb5a66401cc':
Improve camera face detection javadoc.
2011-11-15 06:16:21 -08:00
Wu-cheng Li
b90a70d154
Merge "Improve camera face detection javadoc." into ics-mr1
2011-11-15 06:14:11 -08:00
Wu-cheng Li
8c13670c13
Improve camera face detection javadoc.
...
bug:4460717
Change-Id: I6e040911ce802e597e77dfdde1c92b75d51975c8
2011-11-15 17:55:37 +08:00
Michael Jurka
729a9afe44
am 4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1
...
* commit '4b7494e07a44c0aa363379be463de70455a895f3':
Updating recent apps visuals on tablet
2011-11-14 23:55:12 -08:00
Michael Jurka
4b7494e07a
Merge "Updating recent apps visuals on tablet" into ics-mr1
2011-11-14 23:53:34 -08:00
Michael Jurka
bfd24acd31
Updating recent apps visuals on tablet
...
- getting rid of blue glow (5529032)
- moving app icon position
- show message if there are no recent apps (5533332)
- fixing rare IllegalStateException on orientation change (5584344)
Change-Id: I2210e584957869c8f02339e6841daf39364a9dad
2011-11-14 23:49:10 -08:00
Jeff Sharkey
bc03c74c48
am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
...
* commit 'd968670d8369e5d92ba9b7a45b3804d692a05a4e':
Conservatively trim data usage stats.
2011-11-14 23:39:46 -08:00
Jeff Sharkey
d968670d83
Merge "Conservatively trim data usage stats." into ics-mr1
2011-11-14 23:37:17 -08:00
Nick Pelly
26eeedceb1
am b3b66af2: Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1
...
* commit 'b3b66af2b5b4ccca1f507290ab6f138a3cbffc3e':
Move nfc-extras tests into frameworks/base/nfc-extras/tests.
2011-11-14 20:16:07 -08:00
Nick Pelly
b3b66af2b5
Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1
2011-11-14 20:14:11 -08:00
Jim Miller
e5ae019b8c
Fix 5581164: Use abbreviated day in lockscreen
...
This fixes a problem where the alarm status was forced to scroll on phones
when the date string got too long. We now abbreviate the day on lock screen.
Change-Id: I99990f1568282c65fb6ed4e78d20bb31b3487a8e
2011-11-14 20:13:50 -08:00
Jeff Sharkey
7ee8658453
Conservatively trim data usage stats.
...
Instead of trusting NTP time alone, use the most-conservative of
system clock and NTP.
Bug: 5584564
Change-Id: I5dd87fc009959b1cf0a7d660e385a0b1a8be238b
2011-11-14 20:11:38 -08:00