Merge "Add Save and Restore of BluetoothOn setting" am: bbcc641317 am: 1755a4af45

am: 6682651b2b

Change-Id: I6dd36520e8a0cf09c75788eda2e03b4309acea9e

diff --cc core/java/android/provider/Settings.java
index 0840549,76c665c..a311ae7
--- 1/core/java/android/provider/Settings.java
--- 2/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@@ -9919,18 -9121,15 +9919,19 @@@ public final class Settings 
              CALL_AUTO_RETRY,
              DOCK_AUDIO_MEDIA_ENABLED,
              ENCODED_SURROUND_OUTPUT,
-             LOW_POWER_MODE_TRIGGER_LEVEL
+             LOW_POWER_MODE_TRIGGER_LEVEL,
+             BLUETOOTH_ON
          };
  
 +        private static final ContentProviderHolder sProviderHolder =
 +                new ContentProviderHolder(CONTENT_URI);
 +
          // Populated lazily, guarded by class object:
 -        private static NameValueCache sNameValueCache = new NameValueCache(
 +        private static final NameValueCache sNameValueCache = new NameValueCache(
                      CONTENT_URI,
                      CALL_METHOD_GET_GLOBAL,
 -                    CALL_METHOD_PUT_GLOBAL);
 +                    CALL_METHOD_PUT_GLOBAL,
 +                    sProviderHolder);
  
          // Certain settings have been moved from global to the per-user secure namespace
          private static final HashSet<String> MOVED_TO_SECURE;

diff --cc packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
Simple merge

diff --cc services/core/java/com/android/server/BluetoothManagerService.java
index c785fb9,5a3c7d0..b65f54e
--- 1/services/core/java/com/android/server/BluetoothManagerService.java
--- 2/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@@ -119,7 -119,12 +120,11 @@@ class BluetoothManagerService extends I
      private static final int MESSAGE_USER_UNLOCKED = 301;
      private static final int MESSAGE_ADD_PROXY_DELAYED = 400;
      private static final int MESSAGE_BIND_PROFILE_SERVICE = 401;
+     private static final int MESSAGE_RESTORE_USER_SETTING = 500;
+ 
+     private static final int RESTORE_SETTING_TO_ON = 1;
+     private static final int RESTORE_SETTING_TO_OFF = 0;
  
 -    private static final int MAX_SAVE_RETRIES = 3;
      private static final int MAX_ERROR_RESTART_RETRIES = 6;
  
      // Bluetooth persisted setting is off