commit 8c18431be868e0960e80638c1a974d71a0df05b4
author Andre Eisenbach <eisenbach@google.com> Tue Sep 06 18:03:10 2016 -0700
committer Andre Eisenbach <eisenbach@google.com> Fri Sep 09 16:20:27 2016 -0700
tree 2862ada67633c8db591fae5ece0e6aefcc4c893a
parent 07682b728d853733b5337a3b000fec0d3c349109

Enable Bluetooth by default

Bug: 29446913
Change-Id: I6d42810cb3f99617b886f6c643f8c66c42c1d017

services/core/java/com/android/server/BluetoothManagerService.java

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index 8c5887f..89fdfaf 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -293,7 +293,7 @@
      */
     private final boolean isBluetoothPersistedStateOn() {
         return Settings.Global.getInt(mContentResolver,
-                Settings.Global.BLUETOOTH_ON, 0) != BLUETOOTH_OFF;
+                Settings.Global.BLUETOOTH_ON, BLUETOOTH_ON_BLUETOOTH) != BLUETOOTH_OFF;
     }
 
     /**
@@ -301,7 +301,7 @@
      */
     private final boolean isBluetoothPersistedStateOnBluetooth() {
         return Settings.Global.getInt(mContentResolver,
-                Settings.Global.BLUETOOTH_ON, 0) == BLUETOOTH_ON_BLUETOOTH;
+                Settings.Global.BLUETOOTH_ON, BLUETOOTH_ON_BLUETOOTH) == BLUETOOTH_ON_BLUETOOTH;
     }
 
     /**