Jason Noguchi
743aceec42
am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
...
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
Adding time lapse test to mediaframework stress suite.
2012-02-28 11:50:14 -08:00
Jason Noguchi
eac4b187d3
am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
...
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
Adding time lapse test to mediaframework stress suite.
2012-02-28 11:49:30 -08:00
Jason Noguchi
ee32993095
Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
2012-02-28 11:47:46 -08:00
John Reck
42fb45588f
Merge "Fix cursorRingBounds NPE"
2012-02-28 11:40:00 -08:00
John Reck
c2baeffe00
Merge "Fix NPE"
2012-02-28 11:38:56 -08:00
John Reck
5528d7ccd1
Fix cursorRingBounds NPE
...
Bug: 6083657
Change-Id: I0aa30bc1df266b2f74b0fedfb635b71d63638fdb
2012-02-28 11:29:29 -08:00
Dianne Hackborn
ef437848ca
Merge "You could think of this as what an OEM might do."
2012-02-28 11:26:02 -08:00
James Dong
8fe9260bbb
Merge "Deprecated a mis-spelled method and replaced it with a new method"
2012-02-28 11:23:26 -08:00
John Reck
79d99bebc1
Fix NPE
...
Bug: 6083360
Change-Id: I8d4a4cfb4ca0bbefd848a6ed7a628bc3838e4f91
2012-02-28 11:21:17 -08:00
Gilles Debunne
9f102ca592
Vibrate on long press, even out of text
...
Bug 6073057
Change-Id: I53441f365419aa1ae4d51e03efff46697059d38a
2012-02-28 11:15:56 -08:00
Android Git Automerger
af2abf5ada
am a66926ff: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
...
* commit 'a66926ff7fac7ef77da1b5f3f1a1dd9dd8d6b960':
2012-02-28 10:51:35 -08:00
Svetoslav Ganov
0631ac93f6
am 8f4582a2: am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus.
...
* commit '8f4582a278d3f93450f2a72ad6f6dc872668efb9':
2012-02-28 10:51:32 -08:00
Android Git Automerger
a66926ff7f
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
2012-02-28 10:49:07 -08:00
Svetoslav Ganov
69db4df487
am 0c96daa5: am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus.
...
* commit '0c96daa5d5a1ef778ad1ef4619ef1fa4c30519c6':
NumberPicker showing IME when its input field gains focus.
2012-02-28 10:41:42 -08:00
Svetoslav Ganov
8f4582a278
am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus.
...
* commit 'c78f121716ff7d4cbf8a70519a266ae030942751':
NumberPicker showing IME when its input field gains focus.
2012-02-28 10:39:17 -08:00
Svetoslav Ganov
0c96daa5d5
am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus.
...
* commit '0c7ffac4caf413bd5fef2002079ec1d4bff2bc37':
NumberPicker showing IME when its input field gains focus.
2012-02-28 10:38:39 -08:00
Svetoslav Ganov
0c7ffac4ca
am a2b41b43: NumberPicker showing IME when its input field gains focus.
...
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
NumberPicker showing IME when its input field gains focus.
2012-02-28 10:35:43 -08:00
Svetoslav Ganov
c78f121716
am a2b41b43: NumberPicker showing IME when its input field gains focus.
...
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
NumberPicker showing IME when its input field gains focus.
2012-02-28 10:35:18 -08:00
Glenn Kasten
bd714b6cbe
AudioRecord const methods
...
Change-Id: Ifae4fd7820b650aaca2b13c8658c292db1c46c0f
2012-02-28 08:50:18 -08:00
Jean-Baptiste Queru
d7fa7deef9
Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
2012-02-28 07:28:52 -08:00
Glenn Kasten
f64dfccd96
Merge "Unlock effect chains in the middle of two if's"
2012-02-28 07:23:42 -08:00
Glenn Kasten
c2dc1c4e57
Merge "Simplify removeNotificationClient"
2012-02-28 07:21:51 -08:00
Glenn Kasten
eb70fe50dd
Merge "AudioFlinger const methods and parameters"
2012-02-28 07:21:09 -08:00
Jean-Baptiste Queru
9bb891faf4
am 254cf597: am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
...
* commit '254cf5973ebe5ebdce9ef261d826e88ed2f67f58':
stagefright amr: Avoid C++/C99 for loops with variable declaration
2012-02-28 07:19:40 -08:00
Jean-Baptiste Queru
d92a683fb9
am d107453d: (-s ours) am 84dd87d9: am 015a248e: am 93df415c: Merge "Add stubs for better compatibility"
...
* commit 'd107453ddf3af507e015ac641d5fb67ed513cd4b':
Add stubs for better compatibility
2012-02-28 07:19:36 -08:00
Glenn Kasten
0d07b6a55f
Merge "Fix theoretical race condition in addOutputTrack"
2012-02-28 07:18:27 -08:00
Glenn Kasten
2b119a6336
Merge "AudioBufferProvider comments and cleanup"
2012-02-28 07:17:47 -08:00
satok
4e713f1441
Unblock IPC call in TextServicesManagerService
...
Bug: 5471520
Change-Id: Iedf2c2cdd8d4834545d06d72ade3ce211b104b1d
2012-02-28 17:00:46 +09:00
James Dong
f7a68fc985
Added missing javadoc comment for public API in DrmUtils class
...
o also fixed mis-spelled private method name (quiteDispose => quietlyDispose)
Change-Id: I692cd7471eac547b849dd53853f60843b3915750
2012-02-27 22:46:02 -08:00
James Dong
a3a9d6e746
Remove unnecessary header file includes for drmserver
...
Change-Id: I14033861e74d20f9d4897b651c4eeee126d4d610
2012-02-27 22:26:48 -08:00
Mathias Agopian
b1badfc748
get rid of MemoryHeapPmem
...
MemoryHeapPmem is not used any longer. PMEM is not a supported
type of memory by the system anymore. a particular device might
use PMEM and need something like MemoryHeapPmem, in this case this
should be implemented in device specific code (HAL).
This will most likely break older no longer supported targets.
Change-Id: I434e4291219950018de8b793b0403bb2d92dd5cc
2012-02-27 19:58:57 -08:00
Mathias Agopian
aac99487a1
Merge "a window could get stuck to gpu composition"
2012-02-27 19:48:36 -08:00
Mathias Agopian
3169e4bd15
Merge "move CursorWindow from libbinder to libandroidfw"
2012-02-27 19:48:21 -08:00
Andrew Hsieh
d9df224570
Fixed several 64-bit porting issues
...
1. Use "%zu" instead of "%d" for size_t in printf
2. Variable precision specifier (eg. "%.*s") in printf should be of type int.
(iov_len is size_t which is 64-bit when compiled with -m64)
3. Use PRId64 instead of "%lld" to print variables of type int64_t
Change-Id: I2be40a6514b5dffa0038d62b9bccc3401b8756e6
2012-02-27 18:50:55 -08:00
Dianne Hackborn
d459f4bbfc
You could think of this as what an OEM might do.
...
Except it does nothing.
But eat resources.
Yum, yum!
Current we create five processes. The main process sucks up 16MB of
RAM and creates a full-screen window; only on high-end devices does
the window (and process) use the GPU.
The second through fourth processes just sits there not really doing
anything except using process overhead.
The fifth process runs a background service, slowing eating RAM until
it gets killed by the system (as the system will ultimately do with
background services). It also creates a full-screen window, and always
uses the GPU even on low-end devices.
Change-Id: Ibe9e25f7dbd889f4dc83eed6a3c09b9b0437b4e3
2012-02-27 18:46:29 -08:00
James Dong
5cb68c86cc
Fix API issues in DrmRights class.
...
o account id and subscription id are not mandatory, and thus can be anything
such as null or an empty string.
o removed unnecessary or thus inconsistent checks for account id and subscription id
o updated the javadoc to specify that mimeType could not be null or an empty string.
Change-Id: I704f1dd7fc5d33060da908aae0469d560c7db036
2012-02-27 18:34:04 -08:00
Jim Miller
92e66dd683
Fix 5797764: don't hold PowerManager lock when changing native brightness
...
This fixes a bug where the device could see a priority inversion when
updating display brightness. The problem occurs because the code that
manages screen brightness holds the master lock while waiting for the
native method to complete. On some devices, each call can amount to
tens to hundreds of ms, which meant clients using PowerManager APIs
could block for the duration of the call. In some cases, the animation
could block for many seconds because the unfairness of Java locks.
The solution is to handle all brightness updates in a separate thread that
does not hold the master lock while calling native methods.
This also makes the animation more consistent by animating by actual
wall clock time rather than depending on the round-trip from the driver.
Change-Id: Ifad76fb2fb77e7b2a72dd9150440d87e22581b40
2012-02-27 18:31:03 -08:00
James Dong
c4a9976aa1
Deprecated a mis-spelled method and replaced it with a new method
...
Change-Id: Id049a4effab120c3f837cde60a87efcd89a64ec6
2012-02-27 18:25:31 -08:00
Mathias Agopian
49d2b1864c
move CursorWindow from libbinder to libandroidfw
...
Change-Id: I3b304e4f74e0d0ec8b20c57296c62449c9a0f792
2012-02-27 18:11:20 -08:00
Jeff Sharkey
6f9d697d83
Merge "Move NetworkStatsFactory to faster ProcFileReader."
2012-02-27 18:09:29 -08:00
Jeff Sharkey
1d29a3064f
Move NetworkStatsFactory to faster ProcFileReader.
...
Less GC overhead, and about 8x faster parse times. Verified that
tests pass.
Change-Id: Iff1d374f36103395a193176a88a57eebffa93c56
2012-02-27 18:08:13 -08:00
Stephen Hines
47e432e37c
Add test for signed/unsigned char bug (conversion).
...
BUG=6080056
Change-Id: I7980ff3e4a23ff8ba007ff0372ec855b7272630d
2012-02-27 18:06:51 -08:00
Jamie Gennis
ed6c6575a9
Merge "Add tracing to various graphics components."
2012-02-27 18:06:39 -08:00
James Dong
060526f985
Deprecate default constructor for classes that should have been meant to be interfaces
...
o We should have not exposed these default constructors in the first place.
Change-Id: Ia8bcfe77e9730021ad8870ece67c6d0eed8146ad
2012-02-27 18:00:12 -08:00
Jamie Gennis
a85ca37c84
Add tracing to various graphics components.
...
This change adds ATRACE call tracing to BufferQueue,
SurfaceTextureClient, SurfaceTexture, SurfaceFlinger, Layer, and EGL.
Change-Id: I9d75ed26f5a3f0d1af635da38289520134cfbbb7
2012-02-27 17:50:35 -08:00
Jeff Sharkey
d3b0b5df3f
Merge "Suppress StrictMode when reading /proc/ files."
2012-02-27 17:44:09 -08:00
Jeff Sharkey
453dafa663
Suppress StrictMode when reading /proc/ files.
...
Bug: 6077051
Change-Id: If4f23e947d8b91f9f124baa0460600a6b9353732
2012-02-27 17:42:34 -08:00
Adam Powell
bce4d98609
Merge "View pressed state dispatching tweaks"
2012-02-27 17:38:51 -08:00
Mathias Agopian
74c961013a
Merge "remove dependency on unneeded headers"
2012-02-27 17:38:27 -08:00
Mathias Agopian
021df141ed
remove dependency on unneeded headers
...
Change-Id: I890f40c430beca055bedd95c878eb68b42f232c2
2012-02-27 17:37:26 -08:00