commit c34f1f5dc79982fd8d7bc89a5aabab6b88646c3d
author Chun Zhang <chunzhang@google.com> Mon Mar 07 12:14:33 2022 -0800
committer Chun Zhang <chunzhang@google.com> Mon Mar 07 20:24:11 2022 +0000
tree e05ab2d34ff83f154510a381115ea75e66d1dbe0
parent 6f29145aa41875aef5be67a77c636a63b7d54e4c

Use local variable to enforce ENFORCED_SCAN_ENABLED_VALUE.

This local variable would be removed when we set the default on to false on non-supported OEM devices.

Test: manually tested.
Bug: 223118719

Change-Id: I5b48f5f3af3b2437abb5f83c041b24dcd7680942

nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java

diff --git a/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java b/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
index 3a3c962..04f72f0 100644
--- a/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
+++ b/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
@@ -86,6 +86,7 @@
     /** A notification ID which should be dismissed */
     public static final String EXTRA_NOTIFICATION_ID = ACTION_PREFIX + "EXTRA_NOTIFICATION_ID";
     public static final String ACTION_RESOURCES_APK = "android.nearby.SHOW_HALFSHEET";
+    public static final boolean ENFORCED_SCAN_ENABLED_VALUE = false;
 
     private static Executor sFastPairExecutor;
 
@@ -94,7 +95,7 @@
     final LocatorContextWrapper mLocatorContextWrapper;
     final IntentFilter mIntentFilter;
     final Locator mLocator;
-    private boolean mScanEnabled = false;
+    private boolean mScanEnabled = ENFORCED_SCAN_ENABLED_VALUE;
     private final BroadcastReceiver mScreenBroadcastReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -148,6 +149,7 @@
         Locator.getFromContextWrapper(mLocatorContextWrapper, FastPairCacheManager.class);
         try {
             mScanEnabled = getScanEnabledFromSettings();
+            mScanEnabled = ENFORCED_SCAN_ENABLED_VALUE;
         } catch (Settings.SettingNotFoundException e) {
             Log.w(TAG,
                     "initiate: Failed to get initial scan enabled status from Settings.", e);
@@ -388,6 +390,7 @@
             return;
         }
         mScanEnabled = scanEnabled;
+        mScanEnabled = ENFORCED_SCAN_ENABLED_VALUE;
         invalidateScan();
     }