summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/power/ShutdownThread.java
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2012-03-06 17:15:16 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-16 21:14:15 -0700
commite21a4ac09d2473becaea43a73d19e9e836e7732a (patch)
tree83818e511bf4a9592d4711458c8c8c305037904e /services/java/com/android/server/power/ShutdownThread.java
parent75780aa43103c1810ce422f30fb0cbebde4a0716 (diff)
Add a new version of the disable API.
This allows for the setting to be persisted or not. Also turn on Bluetooth in System Server if needed. It won't work currently because the service wouldn't have started. Change-Id: I15fa2bff93aa32134c1b565fcbe90ba68614b6a1
Diffstat (limited to 'services/java/com/android/server/power/ShutdownThread.java')
-rw-r--r--services/java/com/android/server/power/ShutdownThread.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/java/com/android/server/power/ShutdownThread.java b/services/java/com/android/server/power/ShutdownThread.java
index 82f72f741153..d5b266a4b155 100644
--- a/services/java/com/android/server/power/ShutdownThread.java
+++ b/services/java/com/android/server/power/ShutdownThread.java
@@ -340,8 +340,7 @@ public final class ShutdownThread extends Thread {
bluetooth.getState() == BluetoothAdapter.STATE_OFF;
if (!bluetoothOff) {
Log.w(TAG, "Disabling Bluetooth...");
- //TODO(BT)
- bluetooth.disable(); // disable but don't persist new state
+ bluetooth.disable(false); // disable but don't persist new state
}
} catch (RemoteException ex) {
Log.e(TAG, "RemoteException during bluetooth shutdown", ex);