Christopher Tate
18d12ae570
Merge "Allow Instrumentation to kill even persistent processes"
2011-08-19 15:21:43 -07:00
Rajneesh Chowdury
afdf17cc7b
Merge "Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)"
2011-08-19 15:01:11 -07:00
Dianne Hackborn
b8cf07304e
Merge "Fix issue #5187844 : Query is misrouted to wrong content provider"
2011-08-19 14:49:39 -07:00
Dianne Hackborn
4d920a85c2
Merge "Fix issue #5186318 : Can't take multiple screenshots"
2011-08-19 14:48:40 -07:00
Fabrice Di Meglio
d0eed72e42
Merge "Update TextLayout logging"
2011-08-19 14:39:15 -07:00
Jamie Gennis
5a7ba6284d
Merge "Stagefright: fix a compiler warning"
2011-08-19 14:36:10 -07:00
Amith Yamasani
72174dbaff
Merge "Fix an unintentional change in method signature and avoid an API change."
2011-08-19 14:29:34 -07:00
Stephen Hines
4e34540ab2
Merge "Issue proper parameters to root() calls for RS."
2011-08-19 14:17:47 -07:00
Guang Zhu
d0e763a523
Merge "Use port 18000 instead of 8000 for layout tests"
2011-08-19 12:44:28 -07:00
Eino-Ville Talvala
efed1d3492
Merge "Make changing white-balance mode always disable AWB lock."
2011-08-19 12:42:06 -07:00
Adam Powell
46d529be04
Merge "Fix bug 5174755 - Adjust action bar overflow limits for ifRoom items"
2011-08-19 12:34:28 -07:00
Justin Ho
1f956ae4cc
Merge "Remove old spinner_ assets from zygote Bug: 5076695"
2011-08-19 12:24:06 -07:00
Justin Ho
6defddc60e
Merge "Updated overscroll asset Bug: 5076695"
2011-08-19 12:14:30 -07:00
Wink Saville
666b21df87
Merge "Remove writing pin's to log."
2011-08-19 12:06:54 -07:00
Jason Sams
a53cc55038
Merge "Fix issue with freeing allocation with circular references."
2011-08-19 11:23:46 -07:00
Amith Yamasani
e4f15678d4
Merge "Dismiss the volume overlay dialog when user touches above the dialog as well."
2011-08-19 11:17:48 -07:00
Joe Fernandez
3fd667e143
Merge "docs: OpenGL ES 1.0 and 2.0 Tutorials - Patch1"
2011-08-19 11:13:06 -07:00
Andreas Huber
16b1513c7f
Merge "Raise the maximum input buffer size for the vpx video decoder to 256KB"
2011-08-19 10:33:41 -07:00
Daniel Sandler
29b2078e71
Merge "Low profile mode ("lights out") for phone status bar."
2011-08-19 09:37:30 -07:00
Justin Ho
191e44f6bf
Merge "Unused assets removed from SystemUI"
2011-08-19 09:03:02 -07:00
Mathias Agopian
8da5bf7109
Merge "give the proper orientation to the h/w composer HAL"
2011-08-18 21:05:51 -07:00
Adam Powell
7052ca4ab6
Merge "Fix bug 5186341 - Double Action bar when displayOptions is 0"
2011-08-18 20:36:17 -07:00
Arve Hjønnevåg
c47e52d72e
Merge "Add /proc/pagetypeinfo to dumpstate"
2011-08-18 20:11:47 -07:00
Mathias Agopian
5980b76fe1
Merge "implement EGL_TEXTURE_EXTERNAL_OES in libagl"
2011-08-18 18:53:21 -07:00
Adam Powell
cee4af9663
Merge "Fix bug 5186258 - Incorrect window width is used for custom panel views in the MATCH_PARENT case"
2011-08-18 18:52:29 -07:00
Chih-Chung Chang
32bb0dd025
Merge "Fix 5144356: Native crash while importing music"
2011-08-18 18:39:01 -07:00
Mathias Agopian
d992db3827
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
2011-08-18 18:33:44 -07:00
Adam Powell
53f1fcbb60
Merge "Fix bug 5186160 - ActionBar.hide() doesn't hide the split ActionBar if called before onResume()"
2011-08-18 18:10:03 -07:00
Dianne Hackborn
c60e1eee02
Merge "Fix issue #5180553 : permission RECEIVE_BOOT_COMPLETED is not checked"
2011-08-18 18:05:19 -07:00
Jim Miller
4fa9aa85b3
Merge "Fix 5149726: Add slight delay to initial lock screen 'ping' animation."
2011-08-18 17:46:57 -07:00
Christopher Tate
42ca38a74f
Merge "Stop leaking DeathRecipient and BinderProxy instances"
2011-08-18 17:19:53 -07:00
Mathias Agopian
3a0cae8e5f
implement EGL_TEXTURE_EXTERNAL_OES in libagl
...
this allows the emulator to display some graphics
Change-Id: Ib4671ad70b8df598d02307f2b9c5b843421cea25
2011-08-18 16:26:21 -07:00
Adam Powell
9509b9ce60
Merge "Fix bug 5099037 - No delete option when multiple videos are selected"
2011-08-18 16:24:19 -07:00
Nicolas Roard
35ade2d5ac
Merge "Modify nativeSetProperty to return a boolean indicating if we need to invalidate the content or not."
2011-08-18 15:45:27 -07:00
Fabrice Di Meglio
f080e5c322
Merge "Update BiDiTest app"
2011-08-18 15:17:53 -07:00
Gloria Wang
dc9a241a50
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."
2011-08-18 15:14:36 -07:00
Jeff Sharkey
f956b400b3
Merge "Background data notification, API clean up."
2011-08-18 15:01:10 -07:00
Xavier Ducrohet
0795000832
am d98e1be2: am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"
...
* commit 'd98e1be20e1cca5c36c7e0344500d4a5574568aa':
Change generated dependency file names
2011-08-18 14:51:43 -07:00
Adam Powell
12c1ae55e4
Merge "Fix bug 5185010 - android:backgroundSplit doesn't accept a color value"
2011-08-18 14:49:27 -07:00
Xavier Ducrohet
2585ac80e0
am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"
...
* commit 'f4750724cf8db972a052cb388dc9a39fc7aa6dd6':
Change generated dependency file names
2011-08-18 14:48:49 -07:00
Xavier Ducrohet
97dfe9fcc1
am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"
...
* commit '9d829f98dc19edecb2305b61b9c79517c4f95383':
Change generated dependency file names
2011-08-18 14:45:36 -07:00
Xavier Ducrohet
4141bb21e7
am 21e6e2de: Merge "Change generated dependency file names"
...
* commit '21e6e2de1f0062f949fcc52d0b4559dfa3246e0e':
Change generated dependency file names
2011-08-18 14:41:56 -07:00
Jamie Gennis
7f7e85898f
Merge "SurfaceTexture: fix queues-to-composer"
2011-08-18 14:31:39 -07:00
Xavier Ducrohet
bcb124929a
Merge "Change generated dependency file names"
2011-08-18 14:29:15 -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