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

Commit 171b8f36 authored by Arthur Hsu's avatar Arthur Hsu Committed by android-build-merger
Browse files

Merge "Add config_supportBluetoothPersistedState." 

am: 524fe665

Change-Id: I17c56fa8a5b5a984e26591d1e0e830a1c54fa28e
parents 288915be 524fe665

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -3104,4 +3104,6 @@ 
    <!-- Decide whether to display 'No service' on status bar instead of 'Emergency calls only'

         when SIM is unready. -->

    <bool name="config_display_no_service_when_sim_unready">false</bool>



    <bool name="config_supportBluetoothPersistedState">true</bool>

</resources>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -3082,4 +3082,6 @@ 
  <java-symbol type="integer" name="config_stableDeviceDisplayWidth" />

  <java-symbol type="integer" name="config_stableDeviceDisplayHeight" />

  <java-symbol type="bool" name="config_display_no_service_when_sim_unready" />



  <java-symbol type="bool" name="config_supportBluetoothPersistedState" />

</resources>

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

+10 −0
Original line number Diff line number Diff line
@@ -439,10 +439,17 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                Settings.Global.AIRPLANE_MODE_ON, 0) == 1;

    }



    private boolean supportBluetoothPersistedState() {

        return mContext.getResources().getBoolean(R.bool.config_supportBluetoothPersistedState);

    }



    /**

     *  Returns true if the Bluetooth saved state is "on"

     */

    private boolean isBluetoothPersistedStateOn() {

        if (!supportBluetoothPersistedState()) {

            return false;

        }

        int state = Settings.Global.getInt(mContentResolver, Settings.Global.BLUETOOTH_ON, -1);

        if (DBG) {

            Slog.d(TAG, "Bluetooth persisted state: " + state);
@@ -454,6 +461,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
     *  Returns true if the Bluetooth saved state is BLUETOOTH_ON_BLUETOOTH

     */

    private boolean isBluetoothPersistedStateOnBluetooth() {

        if (!supportBluetoothPersistedState()) {

            return false;

        }

        return Settings.Global.getInt(mContentResolver, Settings.Global.BLUETOOTH_ON,

                BLUETOOTH_ON_BLUETOOTH) == BLUETOOTH_ON_BLUETOOTH;

    }