Merge "Persist Bluetooth CoD config value across reboot" am: ba45409c92 am: b977674b17

am: 7cc5e10c2f

Change-Id: I4a0d1e8cc4f879896c3029a8f871d794362e0bca

2 files changed, 11 insertions, 2 deletions

diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
index c450f8aab066..a511db331bf0 100644
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -1134,8 +1134,10 @@ public final class BluetoothAdapter {
     }
 
     /**
-     * Sets the {@link BluetoothClass} Bluetooth Class of Device (CoD) of
-     * the local Bluetooth adapter.
+     * Sets the {@link BluetoothClass} Bluetooth Class of Device (CoD) of the local Bluetooth
+     * adapter.
+     *
+     * <p>Note: This value persists across system reboot.
      *
      * @param bluetoothClass {@link BluetoothClass} to set the local Bluetooth adapter to.
      * @return true if successful, false if unsuccessful.
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 042f8dff3786..a27df3a70259 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7615,6 +7615,13 @@ public final class Settings {
         public static final String AIRPLANE_MODE_TOGGLEABLE_RADIOS = "airplane_mode_toggleable_radios";
 
         /**
+         * An integer representing the Bluetooth Class of Device (CoD).
+         *
+         * @hide
+         */
+        public static final String BLUETOOTH_CLASS_OF_DEVICE = "bluetooth_class_of_device";
+
+        /**
          * A Long representing a bitmap of profiles that should be disabled when bluetooth starts.
          * See {@link android.bluetooth.BluetoothProfile}.
          * {@hide}