Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cc5e10c authored by Pulkit Bhuwalka's avatar Pulkit Bhuwalka Committed by android-build-merger
Browse files

Merge "Persist Bluetooth CoD config value across reboot" am: ba45409c 

am: b977674b

Change-Id: I6b6745eb558d664e1f17d5e808c66990cd0038eb
parents 47fb2aa9 b977674b

core/java/android/bluetooth/BluetoothAdapter.java

+4 −2
Original line number Diff line number Diff line
@@ -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.

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -7559,6 +7559,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}.