joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

[automerge] Resolve API council feedback 2p: 1b2a5bf724

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/17341611

Change-Id: Ic344c2978bcbe3207bc6c4442057a687c0712092
This commit is contained in:
Presubmit Automerger Backend 2022-03-23 19:05:35 +00:00
commit afde4cb059
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
framework-t/api/system-current.txt
View file

@ -301,7 +301,7 @@ package android.nearby {
}
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);

5
nearby/framework/java/android/nearby/NearbyManager.java
View file

@ -244,12 +244,11 @@ public class NearbyManager {
* 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;
}

4
nearby/service/java/com/android/server/nearby/fastpair/FastPairManager.java
View file

@ -155,7 +155,7 @@ public class FastPairManager {
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 class FastPairManager {
public void onChange(boolean selfChange, Uri uri) {
super.onChange(selfChange, uri);
setScanEnabled(
NearbyManager.getFastPairScanEnabled(mLocatorContextWrapper, mScanEnabled));
NearbyManager.getFastPairScanEnabled(mLocatorContextWrapper.getContext()));
}
};
try {

2
nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java
View file

@ -140,7 +140,7 @@ public class NearbyManagerTest {
@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() {