Matthew Xie 61c0fc41e1 DO NOT MERGE - cherry pick a Bluetooth property fix from master ...

Check nullpointer of discoverableTimeout in initBluetoothAfterTurningOn.

When we fail to get the property, print out warning message, turn
Discoverable off.
Bug 6302990

Change-Id: Ie21aa2a89050c74d99d9ee521a95ffa822114757

2012-06-14 11:44:06 -07:00

..

java

DO NOT MERGE - cherry pick a Bluetooth property fix from master

2012-06-14 11:44:06 -07:00

jni

am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1

2012-01-13 13:12:41 -08:00

res

Add streamlined config-based path for no volume key sounds

2012-05-03 15:41:34 -07:00

tests

am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1

2012-03-01 17:07:38 -08:00