summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2011-08-22 17:04:51 -0700
committerMatthew Xie <mattx@google.com>2011-08-22 19:45:48 -0700
commitd96daf1ae5f314ea5f56b3e0b465e3f3b0314235 (patch)
tree6d076baa80077eaabfd617516978724dfd67ad3b /core/java/android
parent86c471db06e35f0cd96e5505f8eae56294d0272f (diff)
downloadframeworks_base-d96daf1ae5f314ea5f56b3e0b465e3f3b0314235.zip
frameworks_base-d96daf1ae5f314ea5f56b3e0b465e3f3b0314235.tar.gz
frameworks_base-d96daf1ae5f314ea5f56b3e0b465e3f3b0314235.tar.bz2
Set bluetooth discoverable off at power on time if the timeout is no forever
Set bluetooth discoverable off at power on time if the discoverable timeout is no forever bug 5068151 Change-Id: I413e8de5f49030b741a8b84a566065d112ee60be
Diffstat (limited to 'core/java/android')
-rwxr-xr-xcore/java/android/server/BluetoothService.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java
index ee14673..e415fc3 100755
--- a/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
@@ -600,6 +600,11 @@ public class BluetoothService extends IBluetooth.Stub {
* It inits bond state and profile state before STATE_ON intent is broadcasted.
*/
/*package*/ void initBluetoothAfterTurningOn() {
+ String discoverable = getProperty("Discoverable", false);
+ String timeout = getProperty("DiscoverableTimeout", false);
+ if (discoverable.equals("true") && Integer.valueOf(timeout) != 0) {
+ setAdapterPropertyBooleanNative("Discoverable", 0);
+ }
mBondState.initBondState();
initProfileState();
}