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

Commit 40c70ba0 authored by Arthur Hsu's avatar Arthur Hsu
Browse files

resolve merge conflicts of 034baa13 to 

master

Test: I solemnly swear I tested this conflict resolution.

Change-Id: I095f92ed3607616a7147a23f1fd9cd65b72e921b
parents ced5ce1b 034baa13

service/java/com/android/server/bluetooth/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;

    }