Arnaud Ferir
ac9b340ff7
am 5e81a6e2: Fix trace mismatch.
...
* commit '5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
Fix trace mismatch.
2011-01-24 10:49:40 -08:00
Sylvain Fonteneau
32ca480fc1
am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
...
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-24 10:49:36 -08:00
John Wang
0c3416139b
am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
...
* commit '93300ce2d398195d5616a2e924eb4a785274538e':
Enable recovery in RIL wakelock release check.
2011-01-24 09:26:56 -08:00
John Wang
c5da08b788
Merge "Enable recovery in RIL wakelock release check." into gingerbread
2011-01-24 09:14:14 -08:00
Nick Pelly
817c3a60c3
am c896d85c: Merge "Add operands to mifare classic increment, decrement." into gingerbread
...
* commit 'c896d85c15d8a6c98c93df57d88481b89eb878f5':
Add operands to mifare classic increment, decrement.
2011-01-23 22:14:54 -08:00
Nick Pelly
c6547f4f92
Merge "Add operands to mifare classic increment, decrement." into gingerbread
2011-01-23 22:12:25 -08:00
Nick Pelly
e94ab5ebf8
am da01b4ab: Merge "Make MifareClassic methods more consistent." into gingerbread
...
* commit 'da01b4abb817fcebdf33c27aaa6a1ac4a61beee0':
Make MifareClassic methods more consistent.
2011-01-23 21:39:39 -08:00
Nick Pelly
5bb6faa957
Merge "Make MifareClassic methods more consistent." into gingerbread
2011-01-23 21:36:14 -08:00
Jeff Hamilton
68c9cf7818
am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
...
* commit 'e1e70c57613956dff0f14829f6385e26c323b609':
Allow null filters for foreground dispatch to act as catch all.
2011-01-23 19:28:17 -08:00
Jeff Hamilton
bbb02bc7e4
Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
2011-01-23 19:17:22 -08:00
Jim Miller
256f41e458
am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.
...
* commit '42a461570b9c5502959e429c4f16ca5ca860c4f2':
Fix 3379239: Catch exceptions from workaround for OOM.
2011-01-23 14:30:07 -08:00
Dianne Hackborn
5de960a98a
am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"
...
* commit 'bcf2adeb10c41becec3baa2bcb8de9212272399a':
aapt: Allow raw "%" in unformatted string-arrays
2011-01-23 12:57:33 -08:00
Dianne Hackborn
5ab218b1d3
Merge "aapt: Allow raw "%" in unformatted string-arrays"
2011-01-23 12:44:13 -08:00
Jeff Brown
d1de37fdab
am 265cf2e7: Merge "Fix getSwitchState."
...
* commit '265cf2e76bef9ee369a7d43d567a22a0c39355ef':
Fix getSwitchState.
2011-01-22 21:32:58 -08:00
Jeff Brown
f079d0d3f9
Merge "Fix getSwitchState."
2011-01-22 21:23:19 -08:00
Dianne Hackborn
295a583376
am 35f4d32d: Merge "frameworks/base: Track owner in appropriate owners list of Uri"
...
* commit '35f4d32dc2f0c383323e780ecc7e2764704c5d2c':
frameworks/base: Track owner in appropriate owners list of Uri
2011-01-22 11:50:41 -08:00
Dianne Hackborn
c315da09e8
Merge "frameworks/base: Track owner in appropriate owners list of Uri"
2011-01-22 11:26:05 -08:00
Jaikumar Ganesh
4636e722b5
am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
...
* commit '1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
Do Not Merge Connect other profiles when priority is auto connect.
2011-01-21 21:36:32 -08:00
Jaikumar Ganesh
a43fd13a6e
Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
2011-01-21 21:25:01 -08:00
John Reck
236098576a
am 398a589c: Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread
...
* commit '398a589ccea744556732b25097412dbb22c51271':
DO NOT MERGE - Create db path if it doesn't exit
2011-01-21 14:06:08 -08:00
John Reck
59141d09f5
Merge "DO NOT MERGE - Create db path if it doesn't exit" into gingerbread
2011-01-21 14:03:30 -08:00
Jeff Hamilton
2a0ba6a3fc
am dc54a8c7: Merge "API changes for NFC." into gingerbread
...
* commit 'dc54a8c742e96d6ea8ef3e18c0f2ee1235899599':
API changes for NFC.
2011-01-21 12:33:55 -08:00
Jeff Hamilton
86d7998cf7
Merge "API changes for NFC." into gingerbread
2011-01-21 11:34:20 -08:00
Dianne Hackborn
a5ba0d9ffa
am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page."
...
* commit 'a8069f34f65bee858d87fd232a872a62e85a502b':
Fixes Keyboard availability in "Providing Resources" documentation page.
2011-01-21 09:55:16 -08:00
Dianne Hackborn
e0070aae48
Merge "Fixes Keyboard availability in "Providing Resources" documentation page."
2011-01-21 09:23:29 -08:00
Jean-Michel Trivi
05a8a6a5b1
am a314f32b: Merge "Bug 3365937 notify TTS initialization listener of binding errors" into gingerbread
...
* commit 'a314f32ba92d46687aef9f420eb61491eff485cf':
Bug 3365937 notify TTS initialization listener of binding errors
2011-01-21 09:15:02 -08:00
Jean-Michel Trivi
26fb206ba5
Merge "Bug 3365937 notify TTS initialization listener of binding errors" into gingerbread
2011-01-21 09:09:30 -08:00
Eric Laurent
bfd2e526f2
am c5694ebd: Merge "do not merge - Fix issue 3371096." into gingerbread
...
* commit 'c5694ebda9a50be391ef9cfaa7f93e9efb04b6c5':
do not merge - Fix issue 3371096.
2011-01-20 21:46:21 -08:00
Dianne Hackborn
46c3eb534c
am 11576102: Fix issue #3373438 : Update GBMR versions
...
* commit '11576102a9794ef964a08bc372dc09803f58997a':
Fix issue #3373438 : Update GBMR versions
2011-01-20 18:18:32 -08:00
Eric Laurent
58efaf2be8
Merge "do not merge - Fix issue 3371096." into gingerbread
2011-01-20 17:43:04 -08:00
Dave Sparks
823aee6d76
am 65d39eeb: Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread
...
* commit '65d39eeb9b032e5507a01daa25afff62b29bffe4':
DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
2011-01-20 17:41:30 -08:00
Mathias Agopian
1a9f485312
am 822d4ce6: Merge "fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly" into gingerbread
...
* commit '822d4ce61687d386f9630b33113c6193257d6878':
fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly
2011-01-20 17:41:20 -08:00
Jeff Brown
943bd096fa
am d0725eef: Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread
...
* commit 'd0725eef671c059b8e26d900fee655747f506dbe':
Never drag scroll views with no children. (DO NOT MERGE)
2011-01-20 17:41:08 -08:00
Jeff Brown
cb203b228b
Fix getSwitchState.
...
InputReader::getSwitchState always returns AKEY_STATE_UNKNOWN
because SwitchInputMapper::getSources() returns 0 which cannot
match any source mask including AINPUT_SOURCE_ANY. As a result
initial lid switch detection is broken.
This change adds a new source constant AINPUT_SOURCE_SWITCH
that indicates that the source has switches.
Change-Id: I5321ecf0ce84f1c2b4535f6c163d3f4dcf9b7a9b
2011-01-19 20:35:47 -08:00
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