[Fast Pair] Remove unused fast pair enabling

Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: I414fd532ef66930e0b7f2313443b0f1358a53662
This commit is contained in:
Xinyi Zhou 2023-02-03 21:53:52 -08:00
commit 372eb95e68
3 changed files with 1 additions and 72 deletions

View file

@ -28,7 +28,6 @@ import android.annotation.SystemService;
import android.content.Context;
import android.nearby.aidl.IOffloadCallback;
import android.os.RemoteException;
import android.provider.Settings;
import android.util.Log;
import com.android.internal.annotations.GuardedBy;
@ -287,34 +286,6 @@ public class NearbyManager {
}
}
/**
* Read from {@link Settings} whether Fast Pair scan is enabled.
*
* @param context the {@link Context} to query the setting
* @return whether the Fast Pair is enabled
* @hide
*/
public static boolean getFastPairScanEnabled(@NonNull Context context) {
final int enabled = Settings.Secure.getInt(
context.getContentResolver(), FAST_PAIR_SCAN_ENABLED, 0);
return enabled != 0;
}
/**
* Write into {@link Settings} whether Fast Pair scan is enabled
*
* @param context the {@link Context} to set the setting
* @param enable whether the Fast Pair scan should be enabled
* @hide
*/
@RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
public static void setFastPairScanEnabled(@NonNull Context context, boolean enable) {
Settings.Secure.putInt(
context.getContentResolver(), FAST_PAIR_SCAN_ENABLED, enable ? 1 : 0);
Log.v(TAG, String.format(
"successfully %s Fast Pair scan", enable ? "enables" : "disables"));
}
private static class OffloadTransport extends IOffloadCallback.Stub {
private final Executor mExecutor;

View file

@ -33,7 +33,6 @@ import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothManager;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@ -43,8 +42,6 @@ import android.nearby.NearbyDevice;
import android.nearby.NearbyManager;
import android.nearby.ScanCallback;
import android.nearby.ScanRequest;
import android.net.Uri;
import android.provider.Settings;
import android.util.Log;
import androidx.annotation.NonNull;
@ -105,7 +102,7 @@ public class FastPairManager {
final LocatorContextWrapper mLocatorContextWrapper;
final IntentFilter mIntentFilter;
final Locator mLocator;
private boolean mScanEnabled;
private boolean mScanEnabled = false;
private final FastPairCacheManager mFastPairCacheManager;
private final BroadcastReceiver mScreenBroadcastReceiver = new BroadcastReceiver() {
@ -229,10 +226,6 @@ public class FastPairManager {
mLocatorContextWrapper.getContext().registerReceiver(mScreenBroadcastReceiver,
mIntentFilter, Context.RECEIVER_EXPORTED);
// Default false for now.
mScanEnabled = NearbyManager.getFastPairScanEnabled(mLocatorContextWrapper.getContext());
registerFastPairScanChangeContentObserver(mLocatorContextWrapper.getContentResolver());
}
/**
@ -434,25 +427,6 @@ public class FastPairManager {
}
}
private void registerFastPairScanChangeContentObserver(ContentResolver resolver) {
mFastPairScanChangeContentObserver = new ContentObserver(ForegroundThread.getHandler()) {
@Override
public void onChange(boolean selfChange, Uri uri) {
super.onChange(selfChange, uri);
setScanEnabled(
NearbyManager.getFastPairScanEnabled(mLocatorContextWrapper.getContext()));
}
};
try {
resolver.registerContentObserver(
Settings.Secure.getUriFor(NearbyManager.FAST_PAIR_SCAN_ENABLED),
/* notifyForDescendants= */ false,
mFastPairScanChangeContentObserver);
} catch (SecurityException e) {
Log.e(TAG, "Failed to register content observer for fast pair scan.", e);
}
}
/**
* Processed task in a background thread
*/
@ -480,13 +454,6 @@ public class FastPairManager {
return (NearbyManager) mLocatorContextWrapper
.getApplicationContext().getSystemService(Context.NEARBY_SERVICE);
}
private void setScanEnabled(boolean scanEnabled) {
if (mScanEnabled == scanEnabled) {
return;
}
mScanEnabled = scanEnabled;
invalidateScan();
}
/**
* Starts or stops scanning according to mAllowScan value.

View file

@ -165,15 +165,6 @@ public class NearbyManagerTest {
mNearbyManager.stopBroadcast(callback);
}
@Test
@SdkSuppress(minSdkVersion = 32, codeName = "T")
public void setFastPairScanEnabled() {
mNearbyManager.setFastPairScanEnabled(mContext, true);
assertThat(mNearbyManager.getFastPairScanEnabled(mContext)).isTrue();
mNearbyManager.setFastPairScanEnabled(mContext, false);
assertThat(mNearbyManager.getFastPairScanEnabled(mContext)).isFalse();
}
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
public void queryOffloadScanSupport() {