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

Commit 09dae065 authored by Stanley Tng's avatar Stanley Tng Committed by android-build-merger
Browse files

Merge "Merge "Add Save and Restore of BluetoothOn setting" am: bbcc6413 am:... 

Merge "Merge "Add Save and Restore of BluetoothOn setting" am: bbcc6413 am: 1755a4af am: 6682651b" into oc-dev-plus-aosp
am: 4c474580

Change-Id: I5a19fd8f898c726d8d94df7a15cfac0161fd28b0
parents a82814f0 4c474580

core/java/android/provider/Settings.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -9949,7 +9949,8 @@ public final class Settings { 
            CALL_AUTO_RETRY,

            CALL_AUTO_RETRY,

            DOCK_AUDIO_MEDIA_ENABLED,

            DOCK_AUDIO_MEDIA_ENABLED,

            ENCODED_SURROUND_OUTPUT,

            ENCODED_SURROUND_OUTPUT,

            LOW_POWER_MODE_TRIGGER_LEVEL

            LOW_POWER_MODE_TRIGGER_LEVEL,

            BLUETOOTH_ON

        };

        };





        private static final ContentProviderHolder sProviderHolder =

        private static final ContentProviderHolder sProviderHolder =

packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -62,11 +62,12 @@ public class SettingsHelper { 
     */

     */

    private static final ArraySet<String> sBroadcastOnRestore;

    private static final ArraySet<String> sBroadcastOnRestore;

    static {

    static {

        sBroadcastOnRestore = new ArraySet<String>(4);

        sBroadcastOnRestore = new ArraySet<String>(5);

        sBroadcastOnRestore.add(Settings.Secure.ENABLED_NOTIFICATION_LISTENERS);

        sBroadcastOnRestore.add(Settings.Secure.ENABLED_NOTIFICATION_LISTENERS);

        sBroadcastOnRestore.add(Settings.Secure.ENABLED_VR_LISTENERS);

        sBroadcastOnRestore.add(Settings.Secure.ENABLED_VR_LISTENERS);

        sBroadcastOnRestore.add(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);

        sBroadcastOnRestore.add(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);

        sBroadcastOnRestore.add(Settings.Secure.ENABLED_INPUT_METHODS);

        sBroadcastOnRestore.add(Settings.Secure.ENABLED_INPUT_METHODS);

        sBroadcastOnRestore.add(Settings.Global.BLUETOOTH_ON);

    }

    }





    private interface SettingsLookup {

    private interface SettingsLookup {

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

+45 −4
Original line number Original line Diff line number Diff line
@@ -91,6 +91,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    private static final String REASON_SYSTEM_BOOT = "system boot";

    private static final String REASON_SYSTEM_BOOT = "system boot";

    private static final String REASON_UNEXPECTED = "unexpected crash";

    private static final String REASON_UNEXPECTED = "unexpected crash";

    private static final String REASON_USER_SWITCH = "user switch";

    private static final String REASON_USER_SWITCH = "user switch";

    private static final String REASON_RESTORE_USER_SETTING = "restore user setting";





    private static final int TIMEOUT_BIND_MS = 3000; //Maximum msec to wait for a bind

    private static final int TIMEOUT_BIND_MS = 3000; //Maximum msec to wait for a bind

    //Maximum msec to wait for service restart

    //Maximum msec to wait for service restart
@@ -119,6 +120,10 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    private static final int MESSAGE_USER_UNLOCKED = 301;

    private static final int MESSAGE_USER_UNLOCKED = 301;

    private static final int MESSAGE_ADD_PROXY_DELAYED = 400;

    private static final int MESSAGE_ADD_PROXY_DELAYED = 400;

    private static final int MESSAGE_BIND_PROFILE_SERVICE = 401;

    private static final int MESSAGE_BIND_PROFILE_SERVICE = 401;

    private static final int MESSAGE_RESTORE_USER_SETTING = 500;



    private static final int RESTORE_SETTING_TO_ON = 1;

    private static final int RESTORE_SETTING_TO_OFF = 0;





    private static final int MAX_ERROR_RESTART_RETRIES = 6;

    private static final int MAX_ERROR_RESTART_RETRIES = 6;
@@ -318,6 +323,26 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                } else {

                } else {

                    if (DBG) Slog.e(TAG, "No Bluetooth Adapter address parameter found");

                    if (DBG) Slog.e(TAG, "No Bluetooth Adapter address parameter found");

                }

                }

            } else if (Intent.ACTION_SETTING_RESTORED.equals(action)) {

                final String name = intent.getStringExtra(Intent.EXTRA_SETTING_NAME);

                if (Settings.Global.BLUETOOTH_ON.equals(name)) {

                    // The Bluetooth On state may be changed during system restore.

                    final String prevValue = intent.getStringExtra(

                            Intent.EXTRA_SETTING_PREVIOUS_VALUE);

                    final String newValue = intent.getStringExtra(

                            Intent.EXTRA_SETTING_NEW_VALUE);



                    if (DBG) Slog.d(TAG, "ACTION_SETTING_RESTORED with BLUETOOTH_ON, prevValue=" +

                                    prevValue + ", newValue=" + newValue);



                    if ((newValue != null) && (prevValue != null) && !prevValue.equals(newValue)) {

                        Message msg = mHandler.obtainMessage(MESSAGE_RESTORE_USER_SETTING,

                                                             newValue.equals("0") ?

                                                             RESTORE_SETTING_TO_OFF :

                                                             RESTORE_SETTING_TO_ON, 0);

                        mHandler.sendMessage(msg);

                    }

                }

            }

            }

        }

        }

    };

    };
@@ -350,12 +375,14 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        registerForBleScanModeChange();

        registerForBleScanModeChange();

        mCallbacks = new RemoteCallbackList<IBluetoothManagerCallback>();

        mCallbacks = new RemoteCallbackList<IBluetoothManagerCallback>();

        mStateChangeCallbacks = new RemoteCallbackList<IBluetoothStateChangeCallback>();

        mStateChangeCallbacks = new RemoteCallbackList<IBluetoothStateChangeCallback>();

        IntentFilter filter = new IntentFilter(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);



        filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);

        IntentFilter filter = new IntentFilter();

        mContext.registerReceiver(mReceiver, filter);

        filter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);

        filter = new IntentFilter(BluetoothAdapter.ACTION_BLUETOOTH_ADDRESS_CHANGED);

        filter.addAction(BluetoothAdapter.ACTION_BLUETOOTH_ADDRESS_CHANGED);

        filter.addAction(Intent.ACTION_SETTING_RESTORED);

        filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);

        filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);

        mContext.registerReceiver(mReceiver, filter);

        mContext.registerReceiver(mReceiver, filter);



        loadStoredNameAndAddress();

        loadStoredNameAndAddress();

        if (isBluetoothPersistedStateOn()) {

        if (isBluetoothPersistedStateOn()) {

            if (DBG) Slog.d(TAG, "Startup: Bluetooth persisted state is ON.");

            if (DBG) Slog.d(TAG, "Startup: Bluetooth persisted state is ON.");
@@ -1421,6 +1448,20 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                    }

                    }

                    break;

                    break;





                case MESSAGE_RESTORE_USER_SETTING:

                    try {

                        if ((msg.arg1 == RESTORE_SETTING_TO_OFF) && mEnable) {

                            if (DBG) Slog.d(TAG, "Restore Bluetooth state to disabled");

                            disable(REASON_RESTORE_USER_SETTING, true);

                        } else if ((msg.arg1 == RESTORE_SETTING_TO_ON) && !mEnable) {

                            if (DBG) Slog.d(TAG, "Restore Bluetooth state to enabled");

                            enable(REASON_RESTORE_USER_SETTING);

                        }

                    } catch (RemoteException e) {

                        Slog.e(TAG,"Unable to change Bluetooth On setting", e);

                    }

                    break;



                case MESSAGE_REGISTER_ADAPTER:

                case MESSAGE_REGISTER_ADAPTER:

                {

                {

                    IBluetoothManagerCallback callback = (IBluetoothManagerCallback) msg.obj;

                    IBluetoothManagerCallback callback = (IBluetoothManagerCallback) msg.obj;