From e8d3c4290a5aa5d59d9f647733f46e076b839147 Mon Sep 17 00:00:00 2001 From: Xinyi Zhou Date: Thu, 3 Mar 2022 15:56:28 -0800 Subject: [PATCH] Use FAST_PAIR_SCAN_ENABLED in Nearby Manager Fix: 216590902 Bug: 223370810 Test: Flashed and confirmed logs Change-Id: I843c416f4f02d66c314f07109cdf8e56ed2edb66 --- .../settings/nearby/FastPairSettingsFragment.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/nearby/FastPairSettingsFragment.java b/src/com/android/settings/nearby/FastPairSettingsFragment.java index f605cf18f83..702e90a915f 100644 --- a/src/com/android/settings/nearby/FastPairSettingsFragment.java +++ b/src/com/android/settings/nearby/FastPairSettingsFragment.java @@ -21,6 +21,7 @@ import android.content.ComponentName; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.nearby.NearbyManager; import android.os.Bundle; import android.provider.Settings; import android.text.TextUtils; @@ -56,9 +57,9 @@ public class FastPairSettingsFragment extends SettingsPreferenceFragment { findPreference(SCAN_SWITCH_KEY)); mainSwitchPreference.addOnSwitchChangeListener( (switchView, isChecked) -> - Settings.Secure.putInt(getContentResolver(), - Settings.Secure.FAST_PAIR_SCAN_ENABLED, isChecked ? 1 : 0)); - mainSwitchPreference.setChecked(isFastPairScanAvailable()); + NearbyManager.setFastPairScanEnabled(getContext(), isChecked)); + mainSwitchPreference.setChecked( + NearbyManager.getFastPairScanEnabled(getContext(), false)); Preference savedDevicePref = Objects.requireNonNull( findPreference(SAVED_DEVICES_PREF_KEY)); @@ -89,11 +90,6 @@ public class FastPairSettingsFragment extends SettingsPreferenceFragment { public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.fast_pair_settings); - private boolean isFastPairScanAvailable() { - return Settings.Secure.getInt(getContentResolver(), - Settings.Secure.FAST_PAIR_SCAN_ENABLED, 1) != 0; - } - @Nullable private ComponentName getSavedDevicesComponent() { String savedDevicesComponent = Settings.Secure.getString(