Mathias Agopian
c856391af6
Merge "fix a weird use of Vector::appendVector()"
2011-07-11 18:30:41 -07:00
Mathias Agopian
cb8be17537
Merge "Fix typo in an assert's log"
2011-07-11 18:30:29 -07:00
Jamie Gennis
1a14b442e0
Merge changes I002177a6,Ibaff52fe
...
* changes:
Add the EGL_ANDROID_recordable spec.
Add the spec for EGL_ANDROID_blob_cache.
2011-07-11 17:14:33 -07:00
Jamie Gennis
bd3b6ef117
Add the EGL_ANDROID_recordable spec.
...
Change-Id: I002177a68fafd6bb941aa64445c85fd5ff56223a
2011-07-11 17:13:02 -07:00
Robert Greenwalt
0f4befbf9f
Merge "Fix wifi tethering."
2011-07-11 16:47:25 -07:00
Guang Zhu
553848be99
Merge "allow Uri as intent extra in am command"
2011-07-11 16:45:35 -07:00
Mathias Agopian
f6f177f2e2
Fix typo in an assert's log
...
Change-Id: I94883a23a0a92eaf3e4976f942f747a2137499ac
2011-07-11 16:26:18 -07:00
Jeff Brown
827a036e02
Merge "Increase activity timeouts when using a wrapper process."
2011-07-11 16:00:11 -07:00
Mike Lockwood
175e29b67d
Merge "UsbDeviceManager: Include kernel USB state in dumpsys output"
2011-07-11 15:52:30 -07:00
Mike Lockwood
fee9da85b9
Merge "UsbDeviceManager: Initialize state based on persist.sys.usb.config rather than current kernel state"
2011-07-11 15:52:06 -07:00
Jason Sams
498a77a5ea
Merge "Add error checks for AllocationAdapters being used in unsupported ways."
2011-07-11 15:47:36 -07:00
Jamie Gennis
0d0c5a6d6b
Merge "EGL: fix the ANativeWindow size/fmt override"
2011-07-11 15:47:20 -07:00
Romain Guy
ed8a338c0b
Merge "Always make GL calls with a valid EGL context. Bug #5010760 "
2011-07-11 15:37:24 -07:00
Romain Guy
e03de93794
Always make GL calls with a valid EGL context.
...
Bug #5010760
Change-Id: If7500ef69683948e727df1406f458f18b11259d1
2011-07-11 15:33:51 -07:00
Eric Laurent
f75b67ad0e
Merge "Audio Effect API: process reverse stream function"
2011-07-11 15:20:27 -07:00
Daniel Lehmann
e0bcaadabb
Merge "Remove restricted white-listing"
2011-07-11 15:10:04 -07:00
Jaikumar Ganesh
c5603d20ad
Merge "Query the correct Extra for BT intents."
2011-07-11 14:41:02 -07:00
Shimeng (Simon) Wang
a736975b23
Merge "Set mActualScale when initialScale is set."
2011-07-11 14:40:04 -07:00
Jaikumar Ganesh
919b1a8495
Merge "Bluetooth Health APIs"
2011-07-11 14:17:57 -07:00
Jeff Brown
716c2e5ce9
Merge "Remove more simulator support code. Bug: 5010576"
2011-07-11 13:41:26 -07:00
Adam Powell
546c4e1302
Merge "New assets from UX for dialogs/menu frames"
2011-07-11 13:39:45 -07:00
Jeff Brown
e145dffb1d
Merge "Eliminate single-process mode. Bug: 5010576"
2011-07-11 13:37:53 -07:00
Jeff Brown
a816cc4e68
Remove more simulator support code.
...
Bug: 5010576
Change-Id: Ie6c8665306bf4e822693b76f25c3a0f05c12d42d
2011-07-11 13:33:22 -07:00
James Dong
e9d6c0361f
Merge "Do not wait for unlaunched threads in stop()"
2011-07-11 12:56:11 -07:00
James Dong
1a7e20cade
Merge "Release camera if CameraSource::start() has not been called"
2011-07-11 12:46:35 -07:00
Jamie Gennis
bee205fd58
EGL: fix the ANativeWindow size/fmt override
...
This change fixes how the Android EGL layer overrides the size and
format of an ANativeWindow in eglCreateWindowSurface. The new behavior
is to leave the size untouched when overriding the format. The previous
behavior was to reset the ANativeWindow to use the default size set by
the ANativeWindow implementation.
It also adds two new 'perform' methods to the ANativeWindow interface:
set_buffers_dimensions and set_buffers_format, and redefines the
behavior of set_buffers_geometry to be the combination of these two new
methods.
Additionally, this change adds an error check for the return value of
the new native_window_set_buffers_format call, which required adding a
(stub) handler for to FramebufferNativeWindow.
Change-Id: I805c7ccd8d4730dfb132d10d8bc3fb058a0b9df1
2011-07-11 12:31:45 -07:00
Mike Lockwood
7e1acdffb2
Merge "Remove unnecessary locking from MediaScanner JNI code"
2011-07-11 12:15:21 -07:00
Jamie Gennis
34d3f3810d
Add the spec for EGL_ANDROID_blob_cache.
...
Change-Id: Ibaff52fee5c856283536ad37251cc80a9f3f938b
2011-07-11 12:06:54 -07:00
Elliott Hughes
6a90b3a3d7
Merge "SDK_INT is not "current" on unreleased builds."
2011-07-11 11:24:54 -07:00
Andy McFadden
14e6a68655
Merge "Relocate common Calendar classes"
2011-07-11 11:24:23 -07:00
Fabrice Di Meglio
582b52b064
Merge "Fix View reset of layoutDirection and textDirection"
2011-07-11 10:52:09 -07:00
Freeman Ng
0d36bde51c
Merge "remove old style button bar look"
2011-07-11 10:46:12 -07:00
Mike Lockwood
606eaf69b5
Merge "UsbDeviceManager: Fix indentation"
2011-07-11 10:41:52 -07:00
Mike Lockwood
f88a0d578f
Merge "MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system"
2011-07-11 10:41:08 -07:00
Mike Lockwood
3494e8a720
Merge "MediaScanner: Use bulk inserts when in batch mode"
2011-07-11 09:12:21 -07:00
Jeff Sharkey
a22433e4a8
Merge "Cached NTP time for system services."
2011-07-10 16:18:58 -07:00
Jim Miller
c682c3d0ad
Merge "Fix 4942542, 4590542: Password unlock fixes"
2011-07-10 14:35:32 -07:00
Jeff Brown
e16986cae2
Eliminate single-process mode.
...
Bug: 5010576
Change-Id: Id450dc83efed4897d1e4ff451530fed14457aace
2011-07-08 19:54:07 -07:00
Elliott Hughes
67ef7c507f
Merge "Pass the targetSdkVersion through to the zygote-forked dalvik."
2011-07-08 18:11:41 -07:00
Robert Ly
060f475750
am d9f91425: am 6b98e712: am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
...
* commit 'd9f91425fc740bc85a8629a27b68b48acaf85962':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
2011-07-08 17:53:12 -07:00
Joe Malin
1a1c28dc8b
am f84bb997: am 230ef987: am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
...
* commit 'f84bb997717501e0af8672608c9d5bd89abe5334':
DOC CHANGE: Change GTV info on intro page
2011-07-08 17:53:09 -07:00
Joe Fernandez
dce1356155
am d1c15f96: am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
...
* commit 'd1c15f96dd2e3b07da6968ea54f6f2bdebe8e190':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
2011-07-08 17:53:06 -07:00
Wink Saville
d60083b00a
am 3ef341cd: am 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
...
* commit '3ef341cda51d5bc35b0bc919f7514653ec194410':
Disconnect ApnContexts in INITING state when error.
2011-07-08 17:52:56 -07:00
Wink Saville
006c3d4ad7
Merge "resolved conflicts for merge of e4a56a32 to master"
2011-07-08 17:48:37 -07:00
Rajneesh Chowdury
b6c544f606
Merge "Fix for issue 5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn"
2011-07-08 17:00:08 -07:00
Romain Guy
c16b883579
Merge "Align paths on pixel boundaries when rasterizing in bitmaps. Bug #5003739 "
2011-07-08 16:53:23 -07:00
Shimeng (Simon) Wang
8570e2fe08
Merge "Prevent set mInitialScale being overridden by mDefaultScale."
2011-07-08 16:48:23 -07:00
Romain Guy
19c61f4cb8
Merge "Correctly render nested rectangles with different winding rules."
2011-07-08 16:27:47 -07:00
Gilles Debunne
675dad843d
Merge "Fleshed up SuggestionSpan documentation. Bug 4553472"
2011-07-08 16:02:36 -07:00
Romain Guy
6e25e45259
Merge "Always redraw the UI on orientation change Bug #4994715 "
2011-07-08 15:54:10 -07:00