Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie6296c9d65d3ea14475e9cb03ac939bf14a8729c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Arthur Ishiguro
2022-07-06 22:22:46 +00:00
committed by Automerger Merge Worker
parent 16ad5b719d dbe797351d
commit 3a3efb4d97
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/location/contexthub/ContextHubService.java
View File

@@ -1183,11 +1183,11 @@ public class ContextHubService extends IContextHubService.Stub {
} }
} else { } else {
Log.d(TAG, "BT adapter not available. Defaulting to disabled"); Log.d(TAG, "BT adapter not available. Defaulting to disabled");
if (mIsBtMainEnabled) { if (forceUpdate || mIsBtMainEnabled) {
mIsBtMainEnabled = false; mIsBtMainEnabled = false;
mContextHubWrapper.onBtMainSettingChanged(mIsBtMainEnabled); mContextHubWrapper.onBtMainSettingChanged(mIsBtMainEnabled);
} }
if (mIsBtScanningEnabled) { if (forceUpdate || mIsBtScanningEnabled) {
mIsBtScanningEnabled = false; mIsBtScanningEnabled = false;
mContextHubWrapper.onBtScanningSettingChanged(mIsBtScanningEnabled); mContextHubWrapper.onBtScanningSettingChanged(mIsBtScanningEnabled);
} }