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

Commit ce4ac9cb authored by Anna Herrera's avatar Anna Herrera Committed by Automerger Merge Worker
Browse files

Merge "Monitor BLE_SCAN_ALWAYS_AVAILABLE setting" into udc-dev am: fc24f822 am: 63e2a34c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22509578



Change-Id: Ia35b680216f704c2cf5e033fa2cfd071ba909b8e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 267952d6 63e2a34c

services/core/java/com/android/server/location/contexthub/ContextHubService.java

+11 −4
Original line number Diff line number Diff line
@@ -519,17 +519,24 @@ public class ContextHubService extends IContextHubService.Stub { 
        BroadcastReceiver btReceiver = new BroadcastReceiver() {

            @Override

            public void onReceive(Context context, Intent intent) {

                if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(intent.getAction())

                        || BluetoothAdapter.ACTION_BLE_STATE_CHANGED.equals(

                        intent.getAction())) {

                if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(intent.getAction())) {

                    sendBtSettingUpdate(/* forceUpdate= */ false);

                }

            }

        };

        IntentFilter filter = new IntentFilter();

        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);

        filter.addAction(BluetoothAdapter.ACTION_BLE_STATE_CHANGED);

        mContext.registerReceiver(btReceiver, filter);



        mContext.getContentResolver().registerContentObserver(

                Settings.Global.getUriFor(Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE),

                /* notifyForDescendants= */ false,

                new ContentObserver(/* handler= */ null) {

                    @Override

                    public void onChange(boolean selfChange) {

                        sendBtSettingUpdate(/* forceUpdate= */ false);

                    }

                }, UserHandle.USER_ALL);

    }



    /**