From 1c3bfb34f8a7944a90a43fc52004770d870ac9ed Mon Sep 17 00:00:00 2001 From: Xinyi Zhou Date: Thu, 3 Mar 2022 15:50:47 -0800 Subject: [PATCH] Remove FAST_PAIR_SCAN_ENABLED Bug: 216590902 Test: Flashed and confirmed logs Change-Id: Ic697259bac1e4358bff8f9544f6879e3a77c8846 --- core/api/system-current.txt | 1 - core/java/android/provider/Settings.java | 8 -------- .../settings/validators/SecureSettingsValidators.java | 2 -- 3 files changed, 11 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 904aa7bf15f7f..53f5a3ab01ca2 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -10535,7 +10535,6 @@ package android.provider { field public static final String AUTO_REVOKE_DISABLED = "auto_revoke_disabled"; field public static final String COMPLETED_CATEGORY_PREFIX = "suggested.completed_category."; field public static final String DOZE_ALWAYS_ON = "doze_always_on"; - field public static final String FAST_PAIR_SCAN_ENABLED = "fast_pair_scan_enabled"; field public static final String HUSH_GESTURE_USED = "hush_gesture_used"; field public static final String INSTANT_APPS_ENABLED = "instant_apps_enabled"; field public static final String LAST_SETUP_SHOWN = "last_setup_shown"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 23e02e9d9968b..208ed11b03ed3 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -10691,14 +10691,6 @@ public final class Settings { public static final String COMMUNAL_MODE_TRUSTED_NETWORKS = "communal_mode_trusted_networks"; - /** - * Setting to allow Fast Pair scans to be enabled. - * @hide - */ - @SystemApi - @Readable - public static final String FAST_PAIR_SCAN_ENABLED = "fast_pair_scan_enabled"; - /** * Setting to store denylisted system languages by the CEC {@code } * confirmation dialog. diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index 5f549fd05e1aa..861d84d437df3 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -325,7 +325,5 @@ public class SecureSettingsValidators { return true; }); VALIDATORS.put(Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED, BOOLEAN_VALIDATOR); - VALIDATORS.put(Secure.FAST_PAIR_SCAN_ENABLED, BOOLEAN_VALIDATOR); - } }