Remove ENFORCED_SCAN_ENABLED_VALUE
Test: m
Fix: 223370810
Change-Id: Ibdb417b4fffade2372b9d50d14b7d3bdd38ae060
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 74c033f..b51203d 100644
--- a/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
+++ b/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
@@ -90,7 +90,6 @@
/** 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;
@@ -99,7 +98,8 @@
final LocatorContextWrapper mLocatorContextWrapper;
final IntentFilter mIntentFilter;
final Locator mLocator;
- private boolean mScanEnabled = ENFORCED_SCAN_ENABLED_VALUE;
+ private boolean mScanEnabled;
+
private final BroadcastReceiver mScreenBroadcastReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
@@ -154,8 +154,8 @@
.registerReceiver(mScreenBroadcastReceiver, mIntentFilter);
Locator.getFromContextWrapper(mLocatorContextWrapper, FastPairCacheManager.class);
- mScanEnabled = NearbyManager.getFastPairScanEnabled(mLocatorContextWrapper, true);
- mScanEnabled = ENFORCED_SCAN_ENABLED_VALUE;
+ // Default false for now.
+ mScanEnabled = NearbyManager.getFastPairScanEnabled(mLocatorContextWrapper, false);
registerFastPairScanChangeContentObserver(mLocatorContextWrapper.getContentResolver());
}
@@ -402,7 +402,6 @@
return;
}
mScanEnabled = scanEnabled;
- mScanEnabled = ENFORCED_SCAN_ENABLED_VALUE;
invalidateScan();
}
diff --git a/nearby/tests/multidevices/host/Android.bp b/nearby/tests/multidevices/host/Android.bp
index 8c6559f..933cae9 100644
--- a/nearby/tests/multidevices/host/Android.bp
+++ b/nearby/tests/multidevices/host/Android.bp
@@ -17,7 +17,6 @@
}
// Run the tests: atest -v CtsNearbyMultiDevicesTestSuite
-// TODO(b/223370810): Flash ROM with ag/17109260 reverted to pass Fast Pair scanning related tests.
python_test_host {
name: "CtsNearbyMultiDevicesTestSuite",
main: "suite_main.py",