OSDN Git Service
Jamie Gennis [Fri, 19 Aug 2011 21:36:10 +0000 (14:36 -0700)]
Merge "Stagefright: fix a compiler warning"
Amith Yamasani [Fri, 19 Aug 2011 21:29:34 +0000 (14:29 -0700)]
Merge "Fix an unintentional change in method signature and avoid an API change."
Stephen Hines [Fri, 19 Aug 2011 21:17:47 +0000 (14:17 -0700)]
Merge "Issue proper parameters to root() calls for RS."
Guang Zhu [Fri, 19 Aug 2011 19:44:28 +0000 (12:44 -0700)]
Merge "Use port 18000 instead of 8000 for layout tests"
Eino-Ville Talvala [Fri, 19 Aug 2011 19:42:06 +0000 (12:42 -0700)]
Merge "Make changing white-balance mode always disable AWB lock."
Adam Powell [Fri, 19 Aug 2011 19:34:28 +0000 (12:34 -0700)]
Merge "Fix bug
5174755 - Adjust action bar overflow limits for ifRoom items"
Justin Ho [Fri, 19 Aug 2011 19:24:06 +0000 (12:24 -0700)]
Merge "Remove old spinner_ assets from zygote Bug:
5076695"
Justin Ho [Fri, 19 Aug 2011 19:14:30 +0000 (12:14 -0700)]
Merge "Updated overscroll asset Bug:
5076695"
Wink Saville [Fri, 19 Aug 2011 19:06:54 +0000 (12:06 -0700)]
Merge "Remove writing pin's to log."
Jason Sams [Fri, 19 Aug 2011 18:23:46 +0000 (11:23 -0700)]
Merge "Fix issue with freeing allocation with circular references."
Amith Yamasani [Fri, 19 Aug 2011 18:17:48 +0000 (11:17 -0700)]
Merge "Dismiss the volume overlay dialog when user touches above the dialog as well."
Joe Fernandez [Fri, 19 Aug 2011 18:13:06 +0000 (11:13 -0700)]
Merge "docs: OpenGL ES 1.0 and 2.0 Tutorials - Patch1"
Andreas Huber [Fri, 19 Aug 2011 17:33:41 +0000 (10:33 -0700)]
Merge "Raise the maximum input buffer size for the vpx video decoder to 256KB"
Daniel Sandler [Fri, 19 Aug 2011 16:37:30 +0000 (09:37 -0700)]
Merge "Low profile mode ("lights out") for phone status bar."
Justin Ho [Fri, 19 Aug 2011 16:03:02 +0000 (09:03 -0700)]
Merge "Unused assets removed from SystemUI"
Mathias Agopian [Fri, 19 Aug 2011 04:05:51 +0000 (21:05 -0700)]
Merge "give the proper orientation to the h/w composer HAL"
Adam Powell [Fri, 19 Aug 2011 03:36:17 +0000 (20:36 -0700)]
Merge "Fix bug
5186341 - Double Action bar when displayOptions is 0"
Arve Hjønnevåg [Fri, 19 Aug 2011 03:11:47 +0000 (20:11 -0700)]
Merge "Add /proc/pagetypeinfo to dumpstate"
Mathias Agopian [Fri, 19 Aug 2011 01:53:21 +0000 (18:53 -0700)]
Merge "implement EGL_TEXTURE_EXTERNAL_OES in libagl"
Adam Powell [Fri, 19 Aug 2011 01:52:29 +0000 (18:52 -0700)]
Merge "Fix bug
5186258 - Incorrect window width is used for custom panel views in the MATCH_PARENT case"
Chih-Chung Chang [Fri, 19 Aug 2011 01:39:01 +0000 (18:39 -0700)]
Merge "Fix
5144356: Native crash while importing music"
Mathias Agopian [Fri, 19 Aug 2011 01:31:00 +0000 (18:31 -0700)]
give the proper orientation to the h/w composer HAL
we were using the "orientation" value instead of the
real transform, which may contain arbitrary rotations for
instance, and in some case ended up with a final "orientation"
that looked valid, but wasn't.
this fixes a problem on devices with a h/w composer hal where
the rotation animation looked weird.
Change-Id: I4be8a2a1bde49c33456fcf5c8d87ab515c216763
Adam Powell [Fri, 19 Aug 2011 01:10:03 +0000 (18:10 -0700)]
Merge "Fix bug
5186160 - ActionBar.hide() doesn't hide the split ActionBar if called before onResume()"
Dianne Hackborn [Fri, 19 Aug 2011 01:05:19 +0000 (18:05 -0700)]
Merge "Fix issue #
5180553: permission RECEIVE_BOOT_COMPLETED is not checked"
Jim Miller [Fri, 19 Aug 2011 00:46:57 +0000 (17:46 -0700)]
Merge "Fix
5149726: Add slight delay to initial lock screen 'ping' animation."
Christopher Tate [Fri, 19 Aug 2011 00:19:53 +0000 (17:19 -0700)]
Merge "Stop leaking DeathRecipient and BinderProxy instances"
Mathias Agopian [Thu, 18 Aug 2011 23:26:21 +0000 (16:26 -0700)]
implement EGL_TEXTURE_EXTERNAL_OES in libagl
this allows the emulator to display some graphics
Change-Id: Ib4671ad70b8df598d02307f2b9c5b843421cea25
Adam Powell [Thu, 18 Aug 2011 23:24:19 +0000 (16:24 -0700)]
Merge "Fix bug
5099037 - No delete option when multiple videos are selected"
Nicolas Roard [Thu, 18 Aug 2011 22:45:27 +0000 (15:45 -0700)]
Merge "Modify nativeSetProperty to return a boolean indicating if we need to invalidate the content or not."
Fabrice Di Meglio [Thu, 18 Aug 2011 22:17:53 +0000 (15:17 -0700)]
Merge "Update BiDiTest app"
Gloria Wang [Thu, 18 Aug 2011 22:14:36 +0000 (15:14 -0700)]
Merge "When switching surface, do not set mSeekNotificationSent as true, because there could be a previous uncompleted seeking which needs to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent as true here, then mediaplayer.cpp will be waiting for message MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp. Fix for bug
5181272."
Jeff Sharkey [Thu, 18 Aug 2011 22:01:10 +0000 (15:01 -0700)]
Merge "Background data notification, API clean up."
Xavier Ducrohet [Thu, 18 Aug 2011 21:51:43 +0000 (14:51 -0700)]
am
d98e1be2: am
f4750724: am
9d829f98: am
21e6e2de: Merge "Change generated dependency file names"
* commit '
d98e1be20e1cca5c36c7e0344500d4a5574568aa':
Change generated dependency file names
Adam Powell [Thu, 18 Aug 2011 21:49:27 +0000 (14:49 -0700)]
Merge "Fix bug
5185010 - android:backgroundSplit doesn't accept a color value"
Xavier Ducrohet [Thu, 18 Aug 2011 21:48:49 +0000 (14:48 -0700)]
am
f4750724: am
9d829f98: am
21e6e2de: Merge "Change generated dependency file names"
* commit '
f4750724cf8db972a052cb388dc9a39fc7aa6dd6':
Change generated dependency file names
Xavier Ducrohet [Thu, 18 Aug 2011 21:45:36 +0000 (14:45 -0700)]
am
9d829f98: am
21e6e2de: Merge "Change generated dependency file names"
* commit '
9d829f98dc19edecb2305b61b9c79517c4f95383':
Change generated dependency file names
Xavier Ducrohet [Thu, 18 Aug 2011 21:41:56 +0000 (14:41 -0700)]
am
21e6e2de: Merge "Change generated dependency file names"
* commit '
21e6e2de1f0062f949fcc52d0b4559dfa3246e0e':
Change generated dependency file names
Jamie Gennis [Thu, 18 Aug 2011 21:31:39 +0000 (14:31 -0700)]
Merge "SurfaceTexture: fix queues-to-composer"
Xavier Ducrohet [Thu, 18 Aug 2011 21:29:15 +0000 (14:29 -0700)]
Merge "Change generated dependency file names"
repo sync [Thu, 18 Aug 2011 20:43:52 +0000 (13:43 -0700)]
Merge "Use supplicant control channel interface for p2p"
Adam Powell [Thu, 18 Aug 2011 20:21:56 +0000 (13:21 -0700)]
Merge "Fix bug
5183775 - Action bar custom layouts with default gravity misbehave"
Daniel Sandler [Thu, 18 Aug 2011 19:52:57 +0000 (12:52 -0700)]
Merge "Don't resize & dim system status icons, only notifications."
Daniel Sandler [Thu, 18 Aug 2011 19:52:12 +0000 (12:52 -0700)]
Merge "Remove 'no notifications' label for now."
Jaikumar Ganesh [Thu, 18 Aug 2011 19:13:30 +0000 (12:13 -0700)]
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
Jaikumar Ganesh [Thu, 18 Aug 2011 19:10:02 +0000 (12:10 -0700)]
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
Jaikumar Ganesh [Thu, 18 Aug 2011 19:08:05 +0000 (12:08 -0700)]
am
6f6b21b4: am
4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
* commit '
6f6b21b407a8883b92b3de9e028e4dc1550b9648':
Bluetooth event loop dispatches dbus data on wakeup
Jaikumar Ganesh [Thu, 18 Aug 2011 19:06:25 +0000 (12:06 -0700)]
am
4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
* commit '
4733d3a6bf10334c93ffbf42e6e850cacbaadd55':
Bluetooth event loop dispatches dbus data on wakeup
Jaikumar Ganesh [Thu, 18 Aug 2011 19:02:35 +0000 (12:02 -0700)]
Merge "Bluetooth event loop dispatches dbus data on wakeup"
Andreas Huber [Thu, 18 Aug 2011 18:46:18 +0000 (11:46 -0700)]
Merge "Some decoders require more gentle treatment"
Adam Powell [Thu, 18 Aug 2011 18:30:48 +0000 (11:30 -0700)]
Merge "Fix bug
5183332 - monkeys are jerks"
Andreas Huber [Thu, 18 Aug 2011 18:10:58 +0000 (11:10 -0700)]
Merge "Disable vorbis-auto-looping if the audio sink used is not realtime, i.e. recording."
Brian Muramatsu [Thu, 18 Aug 2011 17:57:46 +0000 (10:57 -0700)]
Merge "Test for Settings Intent"
Chris Craik [Thu, 18 Aug 2011 17:56:40 +0000 (10:56 -0700)]
Merge "Removed setExtendedTileBounds"
Jeff Sharkey [Thu, 18 Aug 2011 17:52:03 +0000 (10:52 -0700)]
Merge "Preferences padding and scrollbars to match spec."
JP Abgrall [Thu, 18 Aug 2011 16:58:32 +0000 (09:58 -0700)]
Merge "core/java NetworkManagement: Don't untag sockets willy-nilly"
Kenny Root [Thu, 18 Aug 2011 16:20:47 +0000 (09:20 -0700)]
Merge "Default disable watchdog for vold connection"
Daniel Sandler [Thu, 18 Aug 2011 16:20:27 +0000 (09:20 -0700)]
Merge "Support DISABLE_NAVIGATION on phones."
Rajneesh Chowdury [Thu, 18 Aug 2011 16:09:35 +0000 (09:09 -0700)]
Merge "Fix for
5155561 During export, progress bar jumps from 0 to 50%"
Daniel Sandler [Thu, 18 Aug 2011 14:08:46 +0000 (07:08 -0700)]
Merge "Fix DISABLE_EXPAND in the tablet status bar."
Wu-cheng Li [Thu, 18 Aug 2011 05:24:53 +0000 (22:24 -0700)]
Merge "Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE."
Romain Guy [Thu, 18 Aug 2011 03:06:14 +0000 (20:06 -0700)]
Merge "Invoke requestLayout() when drawables have different sizes. Bug #
5142668"
Dianne Hackborn [Thu, 18 Aug 2011 02:18:50 +0000 (19:18 -0700)]
Merge "Fix issue #
5163456: logspam/tight loop in BatteryStatsImpl"
Chet Haase [Thu, 18 Aug 2011 01:38:46 +0000 (18:38 -0700)]
Merge "Fix potential null deref in ViewGroup when running transition"
Chet Haase [Thu, 18 Aug 2011 01:35:07 +0000 (18:35 -0700)]
Merge "Fix NumberPicker text positioning."
Jamie Gennis [Thu, 18 Aug 2011 01:19:00 +0000 (18:19 -0700)]
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
Jeff Sharkey [Thu, 18 Aug 2011 01:12:07 +0000 (18:12 -0700)]
Merge "Combine list of CharSequence with delimeter."
Eino-Ville Talvala [Thu, 18 Aug 2011 00:55:42 +0000 (17:55 -0700)]
Merge "NEW_API: Add real-time Effects."
Dianne Hackborn [Thu, 18 Aug 2011 00:46:48 +0000 (17:46 -0700)]
Merge "Fix issue #
5128639: SystemUI grows by 10MB after taking a screenshot"
Adam Powell [Thu, 18 Aug 2011 00:38:24 +0000 (17:38 -0700)]
Merge "Fix bug
5179524 - ActionBar custom view inflation doesn't catch layout_gravity"
Fabrice Di Meglio [Thu, 18 Aug 2011 00:30:46 +0000 (17:30 -0700)]
Merge "Fix bug #
5175022 Easy mode in MeasuredText.setPara() is no more used"
Amith Yamasani [Thu, 18 Aug 2011 00:28:58 +0000 (17:28 -0700)]
Merge "Don't force measurement when SearchView is in iconified mode."
Jason Sams [Thu, 18 Aug 2011 00:23:16 +0000 (17:23 -0700)]
Merge "Fix "return 0" behavior in rs 0 was not properly blocking for the next message."
Jean-Michel Trivi [Wed, 17 Aug 2011 23:54:37 +0000 (16:54 -0700)]
Merge "Bug
5045498 RemoteControlClient interface"
Adam Powell [Wed, 17 Aug 2011 23:53:03 +0000 (16:53 -0700)]
Merge "Fix bug 533274 - Menu key opens wrong menu in action mode"
Mathias Agopian [Wed, 17 Aug 2011 23:45:35 +0000 (16:45 -0700)]
Merge "don't return the current buffer from dequeueBuffer"
Mathias Agopian [Wed, 17 Aug 2011 23:45:23 +0000 (16:45 -0700)]
Merge "fix a small race condition when returning the default width/height of a SurfaceTexture"
Daniel Sandler [Wed, 17 Aug 2011 23:22:01 +0000 (16:22 -0700)]
Merge "Fix drawing artifacts on glowing navigation buttons."
Daniel Sandler [Wed, 17 Aug 2011 23:21:38 +0000 (16:21 -0700)]
Merge "Allow views to setSystemUiVisibility() with the same value and have it work."
Jason Sams [Wed, 17 Aug 2011 23:13:54 +0000 (16:13 -0700)]
Merge "Add structure to pack params for forEach. This allows the driver to not pass all the sub-params."
Romain Guy [Wed, 17 Aug 2011 22:53:01 +0000 (15:53 -0700)]
Merge "Add RenderScript fragment shader test"
Adam Powell [Wed, 17 Aug 2011 22:49:38 +0000 (15:49 -0700)]
Merge "Fix bug
5167786 - make sure custom option panels still work."
Mathias Agopian [Wed, 17 Aug 2011 22:42:04 +0000 (15:42 -0700)]
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
Eric Laurent [Wed, 17 Aug 2011 21:59:58 +0000 (14:59 -0700)]
Merge "Fix issue
5126270: Holding volume down vibrates"
Adam Powell [Wed, 17 Aug 2011 21:44:51 +0000 (14:44 -0700)]
Merge "Fix bug
5168889 - action bar not respecting return codes of onCreate/Prepare menu"
Xavier Ducrohet [Wed, 17 Aug 2011 21:40:57 +0000 (14:40 -0700)]
am
ddf155b8: am
5dcda1fd: am
88512f59: am
a8313e71: Merge "Fix String16 operator+ to actually work"
* commit '
ddf155b8338eb894a97612e4cb21257c11d8434a':
Fix String16 operator+ to actually work
Xavier Ducrohet [Wed, 17 Aug 2011 21:38:15 +0000 (14:38 -0700)]
am
5dcda1fd: am
88512f59: am
a8313e71: Merge "Fix String16 operator+ to actually work"
* commit '
5dcda1fda53bdc6dfe80cf37e62cacdc216224b1':
Fix String16 operator+ to actually work
Xavier Ducrohet [Wed, 17 Aug 2011 21:35:20 +0000 (14:35 -0700)]
am
88512f59: am
a8313e71: Merge "Fix String16 operator+ to actually work"
* commit '
88512f59bc051a42f4dd70acc8af5622f7e99db6':
Fix String16 operator+ to actually work
Xavier Ducrohet [Wed, 17 Aug 2011 21:31:08 +0000 (14:31 -0700)]
am
a8313e71: Merge "Fix String16 operator+ to actually work"
* commit '
a8313e71fe8b483448d14e22610101c5f3672744':
Fix String16 operator+ to actually work
Xavier Ducrohet [Wed, 17 Aug 2011 21:18:04 +0000 (14:18 -0700)]
Merge "Fix String16 operator+ to actually work"
Gilles Debunne [Wed, 17 Aug 2011 21:03:56 +0000 (14:03 -0700)]
Merge "Fix bit comparison for checking the variant of the input type."
Eric Fischer [Wed, 17 Aug 2011 20:47:39 +0000 (13:47 -0700)]
Merge "Remove translations that contain mangled format strings."
Alex Sakhartchouk [Wed, 17 Aug 2011 20:29:24 +0000 (13:29 -0700)]
Merge "Fixing asynchronous performance issues."
Andreas Huber [Wed, 17 Aug 2011 20:21:40 +0000 (13:21 -0700)]
Merge "Make sure we have all the sample table metadata before declaring a track valid."
Claudia de Veaux [Wed, 17 Aug 2011 19:52:04 +0000 (12:52 -0700)]
Merge "Edits to remove "fail" references, plus edits to "stopped by mistake" dialog. Bugs:
5174094 and
5165745"
Mathias Agopian [Wed, 17 Aug 2011 19:45:40 +0000 (12:45 -0700)]
fix a small race condition when returning the default width/height of a SurfaceTexture
Change-Id: I581bf609505dfb5d4ec5957b2ef2c77df6cfb15f
Adam Cohen [Wed, 17 Aug 2011 18:39:32 +0000 (11:39 -0700)]
Merge "Getting rid of the (hidden) oldName parameter for widgets"
Justin Ho [Wed, 17 Aug 2011 18:17:32 +0000 (11:17 -0700)]
Merge "Updated day_picker Bug:
5076695"
James Dong [Wed, 17 Aug 2011 18:14:49 +0000 (11:14 -0700)]
Merge "Don't time out prematurely for video encoding waiting for output buffers"
Alon Albert [Wed, 17 Aug 2011 17:34:35 +0000 (10:34 -0700)]
Merge "Check for periodic sync that is in the future Bug:
5164762 Change-Id: If578737bcfc4f83756f75c516657afdfc601caf1"
Eric Laurent [Wed, 17 Aug 2011 17:19:06 +0000 (10:19 -0700)]
Merge "Change condition to enter silent mode."