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

Commit 78c2d1a8 authored by Xinyi Zhou's avatar Xinyi Zhou Committed by Android (Google) Code Review
Browse files

Merge "Add FAST_PAIR_SCAN_AVAILABLE to Settings.Secure"

parents 91cfa7ff 5f6a031d

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10224,6 +10224,7 @@ 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/api/system-lint-baseline.txt

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ MissingNullability: android.telephony.mbms.DownloadRequest.Builder#setServiceId( 






NoSettingsProvider: android.provider.Settings.Secure#FAST_PAIR_SCAN_ENABLED:

    New setting keys are not allowed (Field: FAST_PAIR_SCAN_ENABLED); use getters/setters in relevant manager class





OnNameExpected: android.service.smartspace.SmartspaceService#notifySmartspaceEvent(android.app.smartspace.SmartspaceSessionId, android.app.smartspace.SmartspaceTargetEvent):

    Methods implemented by developers should follow the on<Something> style, was `notifySmartspaceEvent`

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -10601,6 +10601,14 @@ 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";



























        /**















         * These entries are considered common between the personal and the managed profile,















         * since the managed profile doesn't get to change them.

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -325,6 +325,7 @@ public class SecureSettingsValidators {













            return true;















        });















        VALIDATORS.put(Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.FAST_PAIR_SCAN_ENABLED, BOOLEAN_VALIDATOR);































    }















}