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

Commit 07a015e2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Enable Bluetooth by default" into nyc-mr1-dev

parents d668f00c 8c18431b

packages/SettingsProvider/res/values/defaults.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
    <fraction name="def_window_transition_scale">100%</fraction>

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



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

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

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

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

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

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

+2 −2
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
     */

    private final boolean isBluetoothPersistedStateOn() {

        return Settings.Global.getInt(mContentResolver,

                Settings.Global.BLUETOOTH_ON, 0) != BLUETOOTH_OFF;

                Settings.Global.BLUETOOTH_ON, BLUETOOTH_ON_BLUETOOTH) != BLUETOOTH_OFF;

    }



    /**
@@ -301,7 +301,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
     */

    private final boolean isBluetoothPersistedStateOnBluetooth() {

        return Settings.Global.getInt(mContentResolver,

                Settings.Global.BLUETOOTH_ON, 0) == BLUETOOTH_ON_BLUETOOTH;

                Settings.Global.BLUETOOTH_ON, BLUETOOTH_ON_BLUETOOTH) == BLUETOOTH_ON_BLUETOOTH;

    }



    /**