Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2dde711e authored by Xinyi Zhou's avatar Xinyi Zhou Committed by Automerger Merge Worker
Browse files

Merge "Remove FAST_PAIR_SCAN_ENABLED" into tm-dev am: 8a7f011f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17074568

Change-Id: I9f479631c177c11689df43b2702fffac9cfaf7da
parents 554e9617 8a7f011f

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -10581,7 +10581,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";

core/java/android/provider/Settings.java

+0 −8
Original line number Diff line number Diff line
@@ -10728,14 +10728,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 <Set Menu Language>}















         * confirmation dialog.

































packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -328,7 +328,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);





























    }















}