Resolve API council feedback
Test: built and verified logs
Fix: 225116248
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: Ic30aee650fd41287d3a363491fa602cd990467a8
diff --git a/framework-t/api/system-current.txt b/framework-t/api/system-current.txt
index fb932d4..ddfd30c 100644
--- a/framework-t/api/system-current.txt
+++ b/framework-t/api/system-current.txt
@@ -301,7 +301,7 @@
}
public class NearbyManager {
- method public static boolean getFastPairScanEnabled(@NonNull android.content.Context, boolean);
+ method public static boolean getFastPairScanEnabled(@NonNull android.content.Context);
method public static void setFastPairScanEnabled(@NonNull android.content.Context, boolean);
method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_ADVERTISE, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void startBroadcast(@NonNull android.nearby.BroadcastRequest, @NonNull java.util.concurrent.Executor, @NonNull android.nearby.BroadcastCallback);
method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int startScan(@NonNull android.nearby.ScanRequest, @NonNull java.util.concurrent.Executor, @NonNull android.nearby.ScanCallback);
diff --git a/nearby/framework/java/android/nearby/NearbyManager.java b/nearby/framework/java/android/nearby/NearbyManager.java
index 2654046..4cb2cc8 100644
--- a/nearby/framework/java/android/nearby/NearbyManager.java
+++ b/nearby/framework/java/android/nearby/NearbyManager.java
@@ -244,12 +244,11 @@
* Read from {@link Settings} whether Fast Pair scan is enabled.
*
* @param context the {@link Context} to query the setting
- * @param def the default value if no setting value
* @return whether the Fast Pair is enabled
*/
- public static boolean getFastPairScanEnabled(@NonNull Context context, boolean def) {
+ public static boolean getFastPairScanEnabled(@NonNull Context context) {
final int enabled = Settings.Secure.getInt(
- context.getContentResolver(), FAST_PAIR_SCAN_ENABLED, (def ? 1 : 0));
+ context.getContentResolver(), FAST_PAIR_SCAN_ENABLED, 0);
return enabled != 0;
}
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 b51203d..16c04de 100644
--- a/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
+++ b/nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
@@ -155,7 +155,7 @@
Locator.getFromContextWrapper(mLocatorContextWrapper, FastPairCacheManager.class);
// Default false for now.
- mScanEnabled = NearbyManager.getFastPairScanEnabled(mLocatorContextWrapper, false);
+ mScanEnabled = NearbyManager.getFastPairScanEnabled(mLocatorContextWrapper.getContext());
registerFastPairScanChangeContentObserver(mLocatorContextWrapper.getContentResolver());
}
@@ -357,7 +357,7 @@
public void onChange(boolean selfChange, Uri uri) {
super.onChange(selfChange, uri);
setScanEnabled(
- NearbyManager.getFastPairScanEnabled(mLocatorContextWrapper, mScanEnabled));
+ NearbyManager.getFastPairScanEnabled(mLocatorContextWrapper.getContext()));
}
};
try {
diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java
index cd61cad..acc7ec0 100644
--- a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java
+++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java
@@ -140,7 +140,7 @@
@SdkSuppress(minSdkVersion = 32, codeName = "T")
public void testSettingsEnable() {
NearbyManager.setFastPairScanEnabled(mContext, false);
- assertThat(NearbyManager.getFastPairScanEnabled(mContext, true)).isFalse();
+ assertThat(NearbyManager.getFastPairScanEnabled(mContext)).isFalse();
}
private void enableBluetooth() {