Commit Graph

37861 Commits

Author SHA1 Message Date
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
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
Xavier Ducrohet
9f4d9d148f Merge "Fix String16 operator+ to actually work" 2011-08-17 14:18:04 -07:00
Gilles Debunne
22cf25cba6 Merge "Fix bit comparison for checking the variant of the input type." 2011-08-17 14:03:56 -07:00
Eric Fischer
a05d2f5b74 Merge "Remove translations that contain mangled format strings." 2011-08-17 13:47:39 -07:00
Alex Sakhartchouk
9f6d58b773 Merge "Fixing asynchronous performance issues." 2011-08-17 13:29:24 -07:00
Andreas Huber
ca9adcac53 Merge "Make sure we have all the sample table metadata before declaring a track valid." 2011-08-17 13:21:40 -07:00
Claudia de Veaux
99e0a743f0 Merge "Edits to remove "fail" references, plus edits to "stopped by mistake" dialog. Bugs: 5174094 and 5165745" 2011-08-17 12:52:04 -07:00
Mathias Agopian
3902be629b fix a small race condition when returning the default width/height of a SurfaceTexture
Change-Id: I581bf609505dfb5d4ec5957b2ef2c77df6cfb15f
2011-08-17 12:45:40 -07:00
Adam Cohen
3cff0866a2 Merge "Getting rid of the (hidden) oldName parameter for widgets" 2011-08-17 11:39:32 -07:00
Justin Ho
21d4505078 Merge "Updated day_picker Bug: 5076695" 2011-08-17 11:17:32 -07:00
James Dong
16e4a7ab41 Merge "Don't time out prematurely for video encoding waiting for output buffers" 2011-08-17 11:14:49 -07:00
Alon Albert
fd96ed248d Merge "Check for periodic sync that is in the future Bug: 5164762 Change-Id: If578737bcfc4f83756f75c516657afdfc601caf1" 2011-08-17 10:34:35 -07:00
Eric Laurent
0454f26183 Merge "Change condition to enter silent mode." 2011-08-17 10:19:06 -07:00
Mathias Agopian
eb2f227faf Merge "as a debug option SrufaceFlinger can now connect to DDMS" 2011-08-17 09:58:33 -07:00
Joe Fernandez
d14ed8f9f9 Merge "docs: OpenGL ES 1.0 and 2.0 Tutorials" 2011-08-17 09:31:45 -07:00
Justin Ho
5e5e311e29 Merge "New spinners Bug: 5165176" 2011-08-17 09:13:16 -07:00
Daniel Sandler
7d3d492a15 Merge "Remove longpress support from the software Home key." 2011-08-17 06:48:13 -07:00
Daniel Sandler
7f5e2c425b Merge "Breathing room between RSSI and battery on tablets." 2011-08-17 06:47:11 -07:00