Jamie Gennis
7f7e85898f
Merge "SurfaceTexture: fix queues-to-composer"
2011-08-18 14:31:39 -07:00
repo sync
3113a73ba4
Merge "Use supplicant control channel interface for p2p"
2011-08-18 13:43:52 -07:00
Adam Powell
4712046fbf
Merge "Fix bug 5183775 - Action bar custom layouts with default gravity misbehave"
2011-08-18 13:21:56 -07:00
Daniel Sandler
bd90eb9de8
Merge "Don't resize & dim system status icons, only notifications."
2011-08-18 12:52:57 -07:00
Daniel Sandler
1758b743dd
Merge "Remove 'no notifications' label for now."
2011-08-18 12:52:12 -07:00
Jaikumar Ganesh
9af5268e45
am 294539df: am 3e941347: am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
...
* commit '294539df2c05eb62c417e25b2e1c8a71474b09e6':
Bluetooth event loop dispatches dbus data on wakeup
2011-08-18 12:13:30 -07:00
Jaikumar Ganesh
167b832f62
am 3e941347: am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
...
* commit '3e9413473f87ad17f3767ffbb0c57046c2db29be':
Bluetooth event loop dispatches dbus data on wakeup
2011-08-18 12:10:02 -07:00
Jaikumar Ganesh
7d4e0c49f6
am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
...
* commit '6f6b21b407a8883b92b3de9e028e4dc1550b9648':
Bluetooth event loop dispatches dbus data on wakeup
2011-08-18 12:08:05 -07:00
Jaikumar Ganesh
56b33ee2ed
am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
...
* commit '4733d3a6bf10334c93ffbf42e6e850cacbaadd55':
Bluetooth event loop dispatches dbus data on wakeup
2011-08-18 12:06:25 -07:00
Jaikumar Ganesh
7be5106263
Merge "Bluetooth event loop dispatches dbus data on wakeup"
2011-08-18 12:02:35 -07:00
Andreas Huber
1023860d20
Merge "Some decoders require more gentle treatment"
2011-08-18 11:46:18 -07:00
Adam Powell
af9768a4e0
Merge "Fix bug 5183332 - monkeys are jerks"
2011-08-18 11:30:48 -07:00
Andreas Huber
5ec9e8d457
Merge "Disable vorbis-auto-looping if the audio sink used is not realtime, i.e. recording."
2011-08-18 11:10:58 -07:00
Brian Muramatsu
3d890c9d4c
Merge "Test for Settings Intent"
2011-08-18 10:57:46 -07:00
Chris Craik
96c0ec7ba3
Merge "Removed setExtendedTileBounds"
2011-08-18 10:56:40 -07:00
Jeff Sharkey
28ca69e9de
Merge "Preferences padding and scrollbars to match spec."
2011-08-18 10:52:03 -07:00
JP Abgrall
6de93216a1
Merge "core/java NetworkManagement: Don't untag sockets willy-nilly"
2011-08-18 09:58:32 -07:00
Kenny Root
262eff8661
Merge "Default disable watchdog for vold connection"
2011-08-18 09:20:47 -07:00
Daniel Sandler
51f327c515
Merge "Support DISABLE_NAVIGATION on phones."
2011-08-18 09:20:27 -07:00
Rajneesh Chowdury
8d01459985
Merge "Fix for 5155561 During export, progress bar jumps from 0 to 50%"
2011-08-18 09:09:35 -07:00
Daniel Sandler
ada1615eba
Merge "Fix DISABLE_EXPAND in the tablet status bar."
2011-08-18 07:08:46 -07:00
Wu-cheng Li
01d7e6e19b
Merge "Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE."
2011-08-17 22:24:53 -07:00
Romain Guy
386546d924
Merge "Invoke requestLayout() when drawables have different sizes. Bug #5142668 "
2011-08-17 20:06:14 -07:00
Dianne Hackborn
9c499ea305
Merge "Fix issue #5163456 : logspam/tight loop in BatteryStatsImpl"
2011-08-17 19:18:50 -07:00
Chet Haase
4d5db76958
Merge "Fix potential null deref in ViewGroup when running transition"
2011-08-17 18:38:46 -07:00
Chet Haase
6cfdfdf0e6
Merge "Fix NumberPicker text positioning."
2011-08-17 18:35:07 -07:00
Jamie Gennis
582270d69d
SurfaceTexture: fix queues-to-composer
...
This change fixes the NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER query of
Surface and SurfaceTextureClient. Surface now uses the inherited
SurfaceTextureClient implementation of this query. SurfaceTextureClient
now queries SurfaceFlinger to determine whether buffers that are queued
to its ISurfaceTexture will be sent to SurfaceFlinger (as opposed to
some other process).
Change-Id: Iff187e72f30d454229f07f896b438198978270a8
2011-08-17 18:19:00 -07:00
Jeff Sharkey
a796242480
Merge "Combine list of CharSequence with delimeter."
2011-08-17 18:12:07 -07:00
Eino-Ville Talvala
3c9cc32fec
Merge "NEW_API: Add real-time Effects."
2011-08-17 17:55:42 -07:00
Dianne Hackborn
a0924f737c
Merge "Fix issue #5128639 : SystemUI grows by 10MB after taking a screenshot"
2011-08-17 17:46:48 -07:00
Adam Powell
63ec8f9675
Merge "Fix bug 5179524 - ActionBar custom view inflation doesn't catch layout_gravity"
2011-08-17 17:38:24 -07:00
Fabrice Di Meglio
46b7515e39
Merge "Fix bug #5175022 Easy mode in MeasuredText.setPara() is no more used"
2011-08-17 17:30:46 -07:00
Amith Yamasani
b611cbaa87
Merge "Don't force measurement when SearchView is in iconified mode."
2011-08-17 17:28:58 -07:00
Jason Sams
ac16e29582
Merge "Fix "return 0" behavior in rs 0 was not properly blocking for the next message."
2011-08-17 17:23:16 -07:00
Jean-Michel Trivi
149f52dff6
Merge "Bug 5045498 RemoteControlClient interface"
2011-08-17 16:54:37 -07:00
Adam Powell
d7e0792bd3
Merge "Fix bug 533274 - Menu key opens wrong menu in action mode"
2011-08-17 16:53:03 -07:00
Mathias Agopian
9a6e71d14f
Merge "don't return the current buffer from dequeueBuffer"
2011-08-17 16:45:35 -07:00
Mathias Agopian
fcdafba030
Merge "fix a small race condition when returning the default width/height of a SurfaceTexture"
2011-08-17 16:45:23 -07:00
Daniel Sandler
8e044f11eb
Merge "Fix drawing artifacts on glowing navigation buttons."
2011-08-17 16:22:01 -07:00
Daniel Sandler
5dfb70a65e
Merge "Allow views to setSystemUiVisibility() with the same value and have it work."
2011-08-17 16:21:38 -07:00
Jason Sams
eb412134f6
Merge "Add structure to pack params for forEach. This allows the driver to not pass all the sub-params."
2011-08-17 16:13:54 -07:00
Romain Guy
5e31573281
Merge "Add RenderScript fragment shader test"
2011-08-17 15:53:01 -07:00
Adam Powell
fef6326684
Merge "Fix bug 5167786 - make sure custom option panels still work."
2011-08-17 15:49:38 -07:00
Mathias Agopian
29b5762efc
don't return the current buffer from dequeueBuffer
...
we were not reseting mCurrentTexture in some situations
which in turn caused dequeueBuffers() return a
"FREE" buffer that was also current.
Very often it was harmless, but it created a race with
updateTexImage() which could cause the following
queueBuffers() to fail.
Bug: 5156325
Change-Id: If15a31dc869117543d220d6e5562c57116cbabdb
2011-08-17 15:49:13 -07:00
Eric Laurent
4ba93eb2a5
Merge "Fix issue 5126270: Holding volume down vibrates"
2011-08-17 14:59:58 -07:00
Adam Powell
0293f77991
Merge "Fix bug 5168889 - action bar not respecting return codes of onCreate/Prepare menu"
2011-08-17 14:44:51 -07:00
Xavier Ducrohet
de16a5a62b
am ddf155b8: am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
...
* commit 'ddf155b8338eb894a97612e4cb21257c11d8434a':
Fix String16 operator+ to actually work
2011-08-17 14:40:57 -07:00
Xavier Ducrohet
754b249bcd
am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
...
* commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1':
Fix String16 operator+ to actually work
2011-08-17 14:38:15 -07:00
Xavier Ducrohet
242915f3d0
am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
...
* commit '88512f59bc051a42f4dd70acc8af5622f7e99db6':
Fix String16 operator+ to actually work
2011-08-17 14:35:20 -07:00
Xavier Ducrohet
35302266fa
am a8313e71: Merge "Fix String16 operator+ to actually work"
...
* commit 'a8313e71fe8b483448d14e22610101c5f3672744':
Fix String16 operator+ to actually work
2011-08-17 14:31:08 -07:00