Romain Guy
c6612db8e0
Merge "Make sure we correctly copy caches keys. Bug #5136067 "
2011-08-12 14:35:27 -07:00
Jason Simmons
a6a51f2bde
Merge "Add a null check to handle failure of android::createPlayer"
2011-08-12 14:20:48 -07:00
John Reck
43a01cf51f
Merge "Remove WebDriver"
2011-08-12 14:20:11 -07:00
Conley Owens
6d9a6567f5
Merge "Add missing include" include exists
2011-08-12 13:40:56 -07:00
Amith Yamasani
501f6256bb
am 4dbd1bc6: am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
...
* commit '4dbd1bc6ae84cb4d0cd28922e917473ec6e53517':
VolumePreference.onActivityStop only stops playback
2011-08-12 13:16:21 -07:00
Conley Owens
3e80266158
Merge "Added stub for getting buffer" stub exists
2011-08-12 13:11:51 -07:00
Daniel Sandler
e53a840698
Merge "Properly disable status bar on secure lockscreens."
2011-08-12 12:56:44 -07:00
Eric Laurent
4326ef41b2
Merge "Fix issue 5144429: CTS test fails for AudioEffects"
2011-08-12 12:49:42 -07:00
Andreas Huber
f83b060b63
Merge "Fix the software AAC decoder's AAC+ detection to ignore malformed frames"
2011-08-12 12:37:26 -07:00
Jeff Brown
e5c4907f05
Merge "Add lsof to bugreport."
2011-08-12 12:36:14 -07:00
Mathias Agopian
b0f720be38
Merge "fix a memory leak and memory corruption in RefBase"
2011-08-12 12:23:54 -07:00
Mathias Agopian
29b4582f35
Merge "SurfaceFlinger doesn't rely on having a custom RefBase destructor"
2011-08-12 12:23:44 -07:00
Ben Murdoch
4007fcac75
Merge "Increase WebView.TAP_TIMEOUT to 300ms to account for trackpad taps."
2011-08-12 11:50:41 -07:00
Chet Haase
f4b9b8232e
Merge "Optimized swipe animation for Recents app."
2011-08-12 11:49:20 -07:00
Adam Powell
397fe7e69a
Merge "Fix bug 5159073 - actionbar titles don't seem to be drawing anymore"
2011-08-12 11:42:15 -07:00
Gilles Debunne
cda7ed6526
Merge "Bug 5150869: Text selection enabled in browser."
2011-08-12 11:36:50 -07:00
Brandon Keely
40eb21c143
Merge "Core transitions updates for phone and tablet."
2011-08-12 11:02:33 -07:00
Jean-Michel Trivi
9eb948667b
Merge "Pass flags on remote control client information change in intent"
2011-08-12 09:21:27 -07:00
Daniel Sandler
0e2b72f0c9
Merge "Fixed cleanspec."
2011-08-12 08:46:52 -07:00
Daniel Sandler
d8560bc40e
Merge "New RSSI cluster in status bar."
2011-08-12 08:40:44 -07:00
Justin Ho
ad2bda5a5e
Merge "Replacing sans serif system font with Roboto"
2011-08-12 07:25:47 -07:00
Debashish Chatterjee
ad330ab1c5
Merge "Set "is_read" = 0 for missed calls."
2011-08-12 02:01:23 -07:00
Mathias Agopian
cbe527884a
fix a memory leak and memory corruption in RefBase
...
we would leak a weakref_impl if a RefBase was never incWeak()'ed.
there was also a dangling pointer that would cause memory corruption
and double-delete when a custom destroyer was used to delay the
execution of ~RefBase.
it turns out that the custom destroyer feature caused most of the
problems, so it's now gone. The only client was SurfaceFlinger
who now handles things on its own.
RefBase is essentially back its "gingerbread" state, but the
code was slightly cleaned-up.
Bug: 5151207, 5084978
Change-Id: Id6ef1d707f96d96366f75068f77b30e0ce2722a5
2011-08-11 22:33:02 -07:00
Mathias Agopian
47d0812977
SurfaceFlinger doesn't rely on having a custom RefBase destructor
...
we just use a message to the main thread to
destroy our GLES state.
2011-08-11 22:33:02 -07:00
Adam Powell
3b17f79044
Merge "Fix bug 5075761 - Visual assets: CAB states"
2011-08-11 22:00:36 -07:00
Ted Bonkenburg
2eedd3bc25
Merge "Remove ParcelSurfaceTexture and update MediaPlayer"
2011-08-11 21:52:27 -07:00
Adam Powell
16c6e9fa0c
Merge "Fix bug 5156213 - Fix title visibility states wrt expanded action views."
2011-08-11 20:32:21 -07:00
Michael Jurka
13c8cc1e72
Merge "On device startup, be in touch mode"
2011-08-11 19:49:15 -07:00
Jeff Brown
a82edf3bbe
Merge "Ensure outValue is set, even when an error occurs."
2011-08-11 18:26:11 -07:00
Xavier Ducrohet
afa7e0cfb7
Merge "Make some methods/fields package private so that layoutlib can access them."
2011-08-11 18:20:09 -07:00
Daniel Sandler
2042fd4486
Merge "Disable peeking at individual notifications."
2011-08-11 17:59:08 -07:00
Romain Guy
273bc989f8
Merge "Remove unnecessary private API"
2011-08-11 17:51:23 -07:00
Romain Guy
67740d00ca
Merge "Fix action bar tabs collapsing when they shouldn't."
2011-08-11 17:46:11 -07:00
Justin Ho
b92a292324
Merge "Updated spinners Bug: 5076695"
2011-08-11 17:24:12 -07:00
Jeff Brown
f2074ccfd8
Merge "Exorcise notification panel ghosts. Bug: 5105599"
2011-08-11 17:23:38 -07:00
Jeff Brown
f36d34f634
Merge "Improve touch device configuration. Bug: 5064702"
2011-08-11 17:23:05 -07:00
Marco Nelissen
a911a0f908
Merge "Only set the ringtones and such if this is the first media scan b/5126979"
2011-08-11 16:29:20 -07:00
Jeff Brown
4f8629eb3f
am 29ccd2a1: am 8f226dcb: (-s ours) am ca97671e: am 6f5a837c: Merge "Fix getSwitchState according to device capabilities."
...
* commit '29ccd2a1b3bc2defb97fa4d76ed031a60181224a':
Fix getSwitchState according to device capabilities.
2011-08-11 16:20:29 -07:00
Jeff Brown
5329585e71
am 56d377c0: am b4459d8d: (-s ours) am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"
...
* commit '56d377c027e223d2baffafb437d98443973e9798':
Support wrapping app processes to inject debug instrumentation. Bug: 4437846
2011-08-11 16:18:30 -07:00
Jeff Brown
0b7ad37bf7
am 8f226dcb: (-s ours) am ca97671e: am 6f5a837c: Merge "Fix getSwitchState according to device capabilities."
...
* commit '8f226dcb21c84f5479a0a1b2d6486293dcd2e937':
Fix getSwitchState according to device capabilities.
2011-08-11 16:15:31 -07:00
Dave Santoro
8cc1b1f12d
Merge "Update read/write profile permission descriptions."
2011-08-11 16:14:28 -07:00
Jeff Brown
98827f95c6
am b4459d8d: (-s ours) am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"
...
* commit 'b4459d8d6d5377db2494f5a11124d49194f1044c':
Support wrapping app processes to inject debug instrumentation. Bug: 4437846
2011-08-11 16:13:11 -07:00
Elliott Hughes
5828b3edc0
Merge "Manually merge the changes made in honeycomb-mr2 to get this on the web."
2011-08-11 15:52:21 -07:00
Jean-Baptiste Queru
37717b58dc
am b654e6e5: am d144748d: Merge "Add missing include"
...
* commit 'b654e6e55a3e8d7e8c2e0b8b1ff4bb4f76c10e05':
Add missing include
2011-08-11 15:22:42 -07:00
Jean-Baptiste Queru
e636a8ad44
am d144748d: Merge "Add missing include"
...
* commit 'd144748d4767b2ccfb13857e23f78bc944e9531d':
Add missing include
2011-08-11 15:18:22 -07:00
Christopher Tate
e81372fa1c
Merge "Fix partial-read handling during restore"
2011-08-11 15:07:25 -07:00
Adam Powell
04c8a78617
Merge "More fun with action bars and themes!"
2011-08-11 14:59:52 -07:00
Gilles Debunne
1542c60421
Merge "Added support for colored / thick underlined text."
2011-08-11 14:50:00 -07:00
Eric Laurent
c3ed6b98b3
Merge "Audio effects: track CPU and memory use separately"
2011-08-11 14:40:04 -07:00
Justin Ho
f4c3ea09b1
Merge "Updated scrubber_control assets, adding pressed state Bug: 5076695"
2011-08-11 14:39:03 -07:00