Mathias Agopian
f6f177f2e2
Fix typo in an assert's log
...
Change-Id: I94883a23a0a92eaf3e4976f942f747a2137499ac
2011-07-11 16:26:18 -07:00
David 'Digit' Turner
f22259c533
am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp
...
* commit 'db4c5f352d6eb8e248953ccff1dbecb1270af4c5':
NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
Fix missing NL
2011-07-11 16:15:27 -07:00
Scott Main
748e3ae359
am bc047bb0: am e32c49ab: docs: de-new sidenavs
...
* commit 'bc047bb03e6084ded47ffd5d810045ca973d54e5':
docs: de-new sidenavs
2011-07-11 16:08:27 -07:00
Scott Main
f33e6fad66
am e32c49ab: docs: de-new sidenavs
...
* commit 'e32c49ab2c5d6b347b39635a0202d7dbdc1f0769':
docs: de-new sidenavs
2011-07-11 16:06:25 -07:00
Robert Ly
663ca47710
am 1e4cf2dd: am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
...
* commit '1e4cf2dddbac4d357731ffaf02c4402426aa3763':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
2011-07-11 16:05:40 -07:00
Robert Ly
4af3d984ba
am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
...
* commit '10a36020e3d37ef088f5f7ed6d64ba35847fc069':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
2011-07-11 16:03:30 -07:00
Jeff Brown
827a036e02
Merge "Increase activity timeouts when using a wrapper process."
2011-07-11 16:00:11 -07:00
David 'Digit' Turner
3b7791c73e
resolved conflicts for merge of 7816eded to gingerbread-plus-aosp
...
Change-Id: I1f7d1f488f6a86774962d427aca472a8a444e0aa
2011-07-12 00:57:09 +02:00
Scott Main
eb1bf2d3cd
am 56a085c9: am d3fa7bd1: docs: fix date on opengl dashboard
...
* commit '56a085c98801d9c4b08cbf398d8225b6761816ac':
docs: fix date on opengl dashboard
2011-07-11 15:53:09 -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
Scott Main
3d652d4b1a
am d3fa7bd1: docs: fix date on opengl dashboard
...
* commit 'd3fa7bd1e873d885f00b11bb8123284357ccd362':
docs: fix date on opengl dashboard
2011-07-11 15:50:16 -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
Xavier Ducrohet
1e477a0fb4
am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.
...
* commit 'aa4b1d8ba9d5e317b67638b764d92d17fb810aa0':
Merge 36a3a392 from mr1.
2011-07-11 12:46:07 -07:00
Xavier Ducrohet
6ec5f34691
am d292d2a0: Merge 36a3a392 from mr1.
...
* commit 'd292d2a03134eaca8b51b6313610b4b78de53c83':
Merge 36a3a392 from mr1.
2011-07-11 12:43:15 -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
Nick Pelly
407c94a147
Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
2011-07-11 11:07:22 -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
Chia-chi Yeh
839c088761
am 4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
...
* commit '4821d3bdf8ce35408c6a10fe45c39a5e701ea8e2':
VpnService: stop VPN when unknown DNS servers show up.
2011-07-11 10:29:32 -07:00
Chia-chi Yeh
ebf0d2dd56
Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
2011-07-11 10:25:28 -07:00
Mike Lockwood
3494e8a720
Merge "MediaScanner: Use bulk inserts when in batch mode"
2011-07-11 09:12:21 -07:00
Wink Saville
94c52b7b90
am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
...
* commit '12b91edc81763b69090bf5815bc8d59ab8d8f342':
Add a property so that CSIM provision check can be bypassed
2011-07-10 19:35:14 -07:00
Wink Saville
8498b8681f
Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
2011-07-10 19:33:54 -07:00
Kazuhiro Ondo
532017726e
am 89799e72: Fix incorrect ERI banner format
...
* commit '89799e72eee54935ec5830f89dfd0a7d32983917':
Fix incorrect ERI banner format
2011-07-10 17:21:52 -07:00
Jeff Sharkey
a22433e4a8
Merge "Cached NTP time for system services."
2011-07-10 16:18:58 -07:00
Kazuhiro Ondo
64bc0f2680
am 64ba5eaa: Concurrent multi-PDP support in TrafficStats
...
* commit '64ba5eaa40614877c679b3fbaaa3c2efd17d50d2':
Concurrent multi-PDP support in TrafficStats
2011-07-10 16:16:54 -07:00
Jim Miller
c682c3d0ad
Merge "Fix 4942542, 4590542: Password unlock fixes"
2011-07-10 14:35:32 -07:00
android-merger
877819515c
reset, and keep history
2011-07-10 10:14:19 -07:00
Jeff Brown
e16986cae2
Eliminate single-process mode.
...
Bug: 5010576
Change-Id: Id450dc83efed4897d1e4ff451530fed14457aace
2011-07-08 19:54:07 -07:00