commit bf6f6f9de72c9fd15e6bda9f228c05a9b37d6324
author Jeff Brown <jeffbrown@google.com> Tue Sep 25 15:03:20 2012 -0700
committer Jeff Brown <jeffbrown@google.com> Tue Sep 25 15:27:51 2012 -0700
tree d0b8906847bdb134fc8ab9b1bae876fccd4611c0
parent d49359631bc2642be73dc162a8a73207df1e0baf

Update references to migrated global settings.

Fixed one setting that was migrated but not marked deprecated.

Removed a hidden setting that is no longer used by the new
power manager service.

Bug: 7231172
Change-Id: I332f020f876a18d519a1a20598a172f1c98036f7

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

diff --git a/services/java/com/android/server/BluetoothManagerService.java b/services/java/com/android/server/BluetoothManagerService.java
index e68686d..aa5ae3d 100755
--- a/services/java/com/android/server/BluetoothManagerService.java
+++ b/services/java/com/android/server/BluetoothManagerService.java
@@ -159,8 +159,8 @@
      *  Returns true if the Bluetooth saved state is "on"
      */
     private final boolean isBluetoothPersistedStateOn() {
-        return Settings.Secure.getInt(mContentResolver,
-                Settings.Secure.BLUETOOTH_ON, 0) ==1;
+        return Settings.Global.getInt(mContentResolver,
+                Settings.Global.BLUETOOTH_ON, 0) ==1;
     }
 
     /**
@@ -168,8 +168,8 @@
      *
      */
     private void persistBluetoothSetting(boolean setOn) {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                               Settings.Secure.BLUETOOTH_ON,
+        Settings.Global.putInt(mContext.getContentResolver(),
+                               Settings.Global.BLUETOOTH_ON,
                                setOn ? 1 : 0);
     }