Dave Sparks
4cec2c81f4
Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread
2011-01-19 19:23:32 -08:00
Mathias Agopian
3357c05996
Merge "fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly" into gingerbread
2011-01-19 17:32:21 -08:00
Jeff Brown
e9089f6994
Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread
2011-01-19 17:03:03 -08:00
Mathias Agopian
226b2432b1
am a0bafb47: Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into gingerbread
...
* commit 'a0bafb471385767f7c9c91efe7fd828b069b2e97':
Use EGL_NATIVE_VISUAL_ID to select EGLConfig
2011-01-19 11:33:36 -08:00
Mathias Agopian
af6bba52c9
Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into gingerbread
2011-01-19 11:31:07 -08:00
Andreas Huber
bdf492ccc4
am e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
...
* commit 'e9a00235c102d198a702bc665b2ea5b5e8c4bc07':
DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
2011-01-19 08:23:47 -08:00
Andreas Huber
017917fe58
Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
2011-01-19 08:11:39 -08:00
Nick Pelly
af4fcf0ad1
am b7d6ffd7: Merge "Change signature of MifareClassic.authenticate*() to throw IOException." into gingerbread
...
* commit 'b7d6ffd76f6c47af488494f5de9560ec490e8241':
Change signature of MifareClassic.authenticate*() to throw IOException.
2011-01-18 18:56:45 -08:00
Nick Pelly
d4dc5550ba
am 50d0bcb4: Merge "Support for TagLostException (API)." into gingerbread
...
* commit '50d0bcb45beb30746271b620ab23ad4d69fd9d5b':
Support for TagLostException (API).
2011-01-18 18:56:41 -08:00
Brad Fitzpatrick
6ef4e385e3
am 597fa828: Merge "Watchdog can get deadlocked on activity manager" into gingerbread
...
* commit '597fa828fa2b3cba053f0afeeac877b1ee2d24b7':
Watchdog can get deadlocked on activity manager
2011-01-18 18:54:25 -08:00
Nick Pelly
b81e631c22
Merge "Change signature of MifareClassic.authenticate*() to throw IOException." into gingerbread
2011-01-18 18:53:42 -08:00
Nick Pelly
851b96a671
Merge "Support for TagLostException (API)." into gingerbread
2011-01-18 18:53:40 -08:00
Brad Fitzpatrick
3b8bbe967a
Merge "Watchdog can get deadlocked on activity manager" into gingerbread
2011-01-18 18:52:04 -08:00
Nick Pelly
543371557a
am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread
...
* commit 'b735aa0b6fabb72097191923d8787b43fa52531e':
Fix javadoc which broke build.
2011-01-18 17:10:33 -08:00
Nick Pelly
073065cc72
Merge "Fix javadoc which broke build." into gingerbread
2011-01-18 17:07:56 -08:00
Eric Laurent
f9edd6160d
am 00118a48: Merge "Fix omission in NOTICE file." into gingerbread
...
* commit '00118a48754c6152266916e7205dff4e0c3a905a':
Fix omission in NOTICE file.
2011-01-18 16:45:08 -08:00
Eric Laurent
ffcdad0b67
Merge "Fix omission in NOTICE file." into gingerbread
2011-01-18 16:42:20 -08:00
Nick Pelly
9623d8ec13
am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
...
* commit 'e4dd154c08b04090bad8f450450e13163d5fef9b':
hange the default IsoDep timeout to 300ms (docs update).
2011-01-18 16:16:36 -08:00
Mathias Agopian
3073b344dd
am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
...
* commit '12d014fdf40f69512e59e84914b230a2d3e7b8eb':
fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
2011-01-18 16:14:13 -08:00
Nick Pelly
17ba3de089
Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
2011-01-18 16:11:14 -08:00
Mathias Agopian
03961aca7c
Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
2011-01-18 16:10:08 -08:00
Amith Yamasani
ece2363481
am 68153821: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread
...
* commit '68153821481f748ecbd2493bfd417005686960e0':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true.
2011-01-18 15:43:44 -08:00
Amith Yamasani
0d7c11e143
Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread
2011-01-18 15:41:26 -08:00
Eric Laurent
2dc65c24ae
Fix omission in NOTICE file.
...
Added copyright notice for audio effects source files under
media/libeffects/lvm.
Change-Id: I8e142bacb7e4b1faaeafe88e907b73f21fced1c3
2011-01-18 15:25:32 -08:00
Irfan Sheriff
e0d4faca0c
am 4170b463: Merge "Do not add unsolicited events to queue" into gingerbread
...
* commit '4170b46329ed91e81cf22dba82e2dadc326b3e3d':
Do not add unsolicited events to queue
2011-01-18 14:43:04 -08:00
Irfan Sheriff
ee780450dc
Merge "Do not add unsolicited events to queue" into gingerbread
2011-01-18 14:40:18 -08:00
Jeff Brown
98e88a7d7a
am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
...
* commit '41395459e676cf9ab4059e08446656f145662c2d':
Filter virtual keys after touches. (DO NOT MERGE)
2011-01-18 14:38:27 -08:00
Jeff Brown
8fb7545953
Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
2011-01-18 14:31:31 -08:00
Brad Fitzpatrick
926cba9e22
am 069e810c: Merge "Fixing memory leak in PreferenceScreen."
...
* commit '069e810c6a5efc0b33fbe8c29a2d11f7c342a4d8':
Fixing memory leak in PreferenceScreen.
2011-01-18 13:39:07 -08:00
Brad Fitzpatrick
49d6c75c2f
Merge "Fixing memory leak in PreferenceScreen."
2011-01-18 13:23:13 -08:00
Brad Fitzpatrick
1c7795d8c8
am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager"
...
* commit 'ded2b00643c788a96ce8adc1a4cc0f7619a4c606':
frameworks/base: remove redundant code in WindowManager
2011-01-18 13:20:06 -08:00
Brad Fitzpatrick
e3cbb9d638
Merge "frameworks/base: remove redundant code in WindowManager"
2011-01-18 12:59:19 -08:00
Martijn Coenen
0edc11dc89
am 07e6f616: Check NDEF before calling makeReadOnly().
...
* commit '07e6f616d122496342a5bae51323bb218d88f7f2':
Check NDEF before calling makeReadOnly().
2011-01-18 11:40:51 -08:00
Martijn Coenen
1d9d7baf9c
am a701cf85: Implement IsoDep timeout handling (API).
...
* commit 'a701cf85a0167a6bb623343388a7dca6f2b61ac5':
Implement IsoDep timeout handling (API).
2011-01-18 11:38:28 -08:00
Mathias Agopian
7ad57ff34f
am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread
...
* commit '72abf01a8b6958ac1f86d36302a8462c4f51fd9d':
Fix the ISurfaceComposer onTransact switch.
2011-01-18 11:26:51 -08:00
Jeff Hamilton
5865053a8e
am 0716ea14: Merge "Javadoc updates for NFC." into gingerbread
...
* commit '0716ea144d94b9dfce4670e90a849db19a492da9':
Javadoc updates for NFC.
2011-01-18 11:26:39 -08:00
Jeff Hamilton
7006d08ba6
am 3a223404: Merge "New APIs for NDEF Push Protocol." into gingerbread
...
* commit '3a223404e7589831a901cb16c5ce97685bc1f3f8':
New APIs for NDEF Push Protocol.
2011-01-18 11:26:22 -08:00
Mathias Agopian
ad2b78fa12
Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread
2011-01-18 11:20:04 -08:00
Jeff Hamilton
c52ca2f61e
Merge "Javadoc updates for NFC." into gingerbread
2011-01-18 11:01:55 -08:00
Jeff Hamilton
7b6ecc4edd
Merge "New APIs for NDEF Push Protocol." into gingerbread
2011-01-18 11:01:05 -08:00
Kenny Root
859c7a377f
am 524133cc: Remove API that snuck into MockPackageManager
...
* commit '524133cc793b5e372cc97c62653281605f57b5b3':
Remove API that snuck into MockPackageManager
2011-01-17 13:05:24 -08:00
Kenny Root
52858bb537
am 34d2b41e: Revert "Add the {get,set}PackageObbPaths calls to API"
...
* commit '34d2b41e48281d1df2c844e004740f008e699093':
Revert "Add the {get,set}PackageObbPaths calls to API"
2011-01-17 12:23:43 -08:00
Mathias Agopian
788ce5d908
Use EGL_NATIVE_VISUAL_ID to select EGLConfig
...
EGLUtils::selectConfigForPixelFormat() now uses EGL_NATIVE_VISUAL_ID
to select a config with the proper format. this is more robust and
future proof.
Change-Id: Ib85e0974160945d838956b50a3cac4de78618957
2011-01-16 17:57:20 -08:00
Jamie Gennis
238bec1ceb
Fix the ISurfaceComposer onTransact switch.
...
Two of the cases in the ISurfaceComposer onTransact switch statement
were missing 'break' statements at the end, and would fall through to
the next case block. This change adds those break statements.
Change-Id: I6dcc84263d3ea03d94612c667103283846b3dee1
2011-01-16 17:34:07 -08:00
Jeff Brown
b7af4940a2
am 4a2e478a: Merge "Flush Binder commands in ndk looper." into gingerbread
...
* commit '4a2e478a5bf6b4650181d1dfa643eadcc387fcec':
Flush Binder commands in ndk looper.
2011-01-16 16:19:00 -08:00
Jim Miller
11f7387fde
am 6687ecb4: Merge "Fix 3106227: use WeakReferences for receivers in DigitalClock class" into gingerbread
...
* commit '6687ecb447025a1c56253d0fd67ad30af070db17':
Fix 3106227: use WeakReferences for receivers in DigitalClock class
2011-01-16 16:16:57 -08:00
Jeff Brown
4cc6fe1eea
Merge "Flush Binder commands in ndk looper." into gingerbread
2011-01-16 16:15:32 -08:00
Jim Miller
3d317da2ab
Merge "Fix 3106227: use WeakReferences for receivers in DigitalClock class" into gingerbread
2011-01-16 16:14:52 -08:00
Nick Pelly
0202684094
am b73203ab: Merge "Make sure service handles are live before passing to other objects." into gingerbread
...
* commit 'b73203ab7e308b747819de2b2400afe971ef3bff':
Make sure service handles are live before passing to other objects.
2011-01-14 18:38:46 -08:00
Jean-Baptiste Queru
dbe61dfa77
merge 83fdc69e from gingerbread - do not merge
...
Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680
2011-01-14 18:33:51 -08:00