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

2022-07-06 22:08:36 +00:00
parent c11694a358 aaec4d200b
commit dbe797351d
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/location/contexthub/ContextHubService.java
+++ b/services/core/java/com/android/server/location/contexthub/ContextHubService.java
@@ -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);
            }