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

Commit 3a3efb4d authored by Arthur Ishiguro's avatar Arthur Ishiguro Committed by Automerger Merge Worker
Browse files

Merge "Always send BT settings on boot" into tm-qpr-dev am: dbe79735 

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



Change-Id: Ie6296c9d65d3ea14475e9cb03ac939bf14a8729c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16ad5b71 dbe79735

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

+2 −2
Original line number Diff line number Diff line
@@ -1183,11 +1183,11 @@ public class ContextHubService extends IContextHubService.Stub { 
            }

        } else {

            Log.d(TAG, "BT adapter not available. Defaulting to disabled");

            if (mIsBtMainEnabled) {

            if (forceUpdate || mIsBtMainEnabled) {

                mIsBtMainEnabled = false;

                mContextHubWrapper.onBtMainSettingChanged(mIsBtMainEnabled);

            }

            if (mIsBtScanningEnabled) {

            if (forceUpdate || mIsBtScanningEnabled) {

                mIsBtScanningEnabled = false;

                mContextHubWrapper.onBtScanningSettingChanged(mIsBtScanningEnabled);

            }