Jaikumar Ganesh
f643974954
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
1c9761e30d
Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
2011-01-21 21:25:01 -08:00
Jaikumar Ganesh
40e6c210f8
Do Not Merge Connect other profiles when priority is auto connect.
...
ACL auto connection was removed so other profiles
won't auto connect when priority was auto connect.
Reduced connect other profiles time delay.
Bug: 3281016
Change-Id: Ic56ca6e95f618f02bc316d1f80014e58c4b6c3bc
2011-01-21 19:05:54 -08:00
John Reck
3cc8a3a47e
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
398a589cce
Merge "DO NOT MERGE - Create db path if it doesn't exit" into gingerbread
2011-01-21 14:03:30 -08:00
Jeff Hamilton
0c5e2b3f13
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
446aea40eb
API changes for NFC.
...
Bug: 3366009
Change-Id: Ia28e03e1501421906b640b78d4c9a59a20e9c668
2011-01-21 12:33:49 -08:00
John Reck
bf8af78973
DO NOT MERGE - Create db path if it doesn't exit
...
Bug: 3241808
Make sure the directory the caller is trying to open the icon db
in actually exists and create it if it doesn't.
Change-Id: Icc0a67b0ceba03a746ac2cd3b84fc34c2c8b4fe2
2011-01-21 11:42:15 -08:00
Jeff Hamilton
dc54a8c742
Merge "API changes for NFC." into gingerbread
2011-01-21 11:34:20 -08:00
Jeff Hamilton
4e21e1d21a
API changes for NFC.
...
Bug: 3366009
Change-Id: Ia28e03e1501421906b640b78d4c9a59a20e9c668
2011-01-21 13:32:58 -06:00
Dianne Hackborn
15efe4cb4c
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
a8069f34f6
Merge "Fixes Keyboard availability in "Providing Resources" documentation page."
2011-01-21 09:23:29 -08:00
Jean-Michel Trivi
3ebade5d42
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
a314f32ba9
Merge "Bug 3365937 notify TTS initialization listener of binding errors" into gingerbread
2011-01-21 09:09:30 -08:00
Keiji Ariyama
a84e088211
Fixes Keyboard availability in "Providing Resources" documentation page.
...
Added keyshidden value.
Change-Id: I9fb1a06971488f446ccafdfa3b0db17786b33f97
2011-01-22 01:58:25 +09:00
Eric Laurent
39999e3af5
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
19fdccfdf8
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
c5694ebda9
Merge "do not merge - Fix issue 3371096." into gingerbread
2011-01-20 17:43:04 -08:00
Dave Sparks
b6e89affd5
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
b703d338c3
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
9cc55346ec
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
Jean-Michel Trivi
1e13a02320
Bug 3365937 notify TTS initialization listener of binding errors
...
The creation of a TextToSpeech object causes the TTS service to
start, and the initialization listener to be called when the
service is connected. But the listener is never called when
the service binding failed to be notified of this error.
The fix consists in checking the result of the bind to service
operation, and notify the listener in case of an error.
More log was added in case speak() and synthesizeToFile() are
called but the service is not known to have started.
Change-Id: I7dcc1fa44be31fee3177ec6215fca3306377b934
2011-01-20 17:25:48 -08:00
Dianne Hackborn
11576102a9
Fix issue #3373438 : Update GBMR versions
...
Change-Id: Ic4b4f1b0534fd2fbd6322eae01a4cb9d5a67cc6f
2011-01-20 12:16:43 -08:00
Eric Laurent
ab1fe306ae
do not merge - Fix issue 3371096.
...
EffectModule::process() was copying effect chain input buffer to
output buffer if no effect was active instead of accumulating it.
Change-Id: If4ca75601ea69a088d0f71d88aec53e90a1dec89
2011-01-20 12:05:25 -08:00
Dave Sparks
65d39eeb9b
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
822d4ce616
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
d0725eef67
Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread
2011-01-19 17:03:03 -08:00
Andreas Huber
a2ab9aace3
DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
...
The latter is an operation that otherwise could block on the datasource
for a significant amount of time. During that time we'd be unable to
abort the preparation phase without this prefill.
Change-Id: I3bc889b264f599bfd5c2bbdf48b88ccb55d86172
related-to-bug: 3362836
2011-01-19 15:44:23 -08:00
Mathias Agopian
a97ead75db
fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly
...
The cut-off frequency of the lowpass filter was too high
for the sampling rate used by DELAY_NORMAL.
Now we use the same filters used for the gravity vector
(cascaded biquad at 1.5 Hz)
Change-Id: Iac290a716cc47a78337a8f0e45b103e49b4d9d78
2011-01-19 15:32:38 -08:00
Mathias Agopian
48d1432e27
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
a0bafb4713
Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into gingerbread
2011-01-19 11:31:07 -08:00
Jeff Brown
39bc6197ba
Never drag scroll views with no children. (DO NOT MERGE)
...
Fixes a regression from Froyo. Previously, when a scroll view
had no children, its onTouchEvent would return because the scroll
view would only start dragging if the user touched one of its children.
In Gingerbread, the user can drag from anywhere within the scroll
view, not just by touching a child. However, it makes no sense
to drag a scroll view that has no children so an empty scroll view
should just ignore touches like any other empty view group would.
This change fixes applications that for some reason or other happen
to have empty scroll views in strange places.
Bug: 3246230
Change-Id: I76c6136d3cd74968983033014d60deec1718ce30
2011-01-19 11:20:46 -08:00
Andreas Huber
66e35c240e
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
e9a00235c1
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
e5099cd3f5
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
8216044435
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
6b2b053b5a
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
b7d6ffd76f
Merge "Change signature of MifareClassic.authenticate*() to throw IOException." into gingerbread
2011-01-18 18:53:42 -08:00
Nick Pelly
50d0bcb45b
Merge "Support for TagLostException (API)." into gingerbread
2011-01-18 18:53:40 -08:00
Nick Pelly
0316d4a24f
Change signature of MifareClassic.authenticate*() to throw IOException.
...
Update API for this and the previous commit.
Change-Id: I19275a5d00081bd0f00afea59a2b673344a32954
2011-01-18 18:52:37 -08:00
Brad Fitzpatrick
597fa828fa
Merge "Watchdog can get deadlocked on activity manager" into gingerbread
2011-01-18 18:52:04 -08:00
Martijn Coenen
bf34061bb4
Support for TagLostException (API).
...
Change-Id: Idf2c3253f7bc5f371133c4f18bfc2afde69c3010
2011-01-18 18:32:50 -08:00
Nick Pelly
ccc9a9e582
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
b735aa0b6f
Merge "Fix javadoc which broke build." into gingerbread
2011-01-18 17:07:56 -08:00
Nick Pelly
a8ca533d34
Fix javadoc which broke build.
...
Change-Id: Ie3cac9bec04e80defae44ba02086ad0cdfd301a9
2011-01-18 17:07:05 -08:00
Eric Laurent
9ffe8338e3
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
Brad Fitzpatrick
0971a1367f
Watchdog can get deadlocked on activity manager
...
Bug: 3351719
Change-Id: Idf3907709340062849a09dd094137e86256ed739
2011-01-18 16:42:20 -08:00
Eric Laurent
00118a4875
Merge "Fix omission in NOTICE file." into gingerbread
2011-01-18 16:42:20 -08:00
Nick Pelly
4d3ac03ade
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
b92a40ebfa
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