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

Commit 8f5970f5 authored by Ravneet Dhanjal's avatar Ravneet Dhanjal Committed by Android (Google) Code Review
Browse files

Merge "Add camera extensions fallback setting" into main

parents ac777cd8 221395b7

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -11829,6 +11829,12 @@ public final class Settings { 
         */

        public static final String MEDIA_CONTROLS_LOCK_SCREEN = "media_controls_lock_screen";













        /**













         * Whether to enable camera extensions software fallback.













         * @hide













         */













        public static final String CAMERA_EXTENSIONS_FALLBACK = "camera_extensions_fallback";



























        /**















         * Controls whether contextual suggestions can be shown in the media controls.















         * @hide

































packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -264,5 +264,6 @@ public class SecureSettings {













        Settings.Secure.EVEN_DIMMER_ACTIVATED,















        Settings.Secure.EVEN_DIMMER_MIN_NITS,















        Settings.Secure.STYLUS_POINTER_ICON_ENABLED,













        Settings.Secure.CAMERA_EXTENSIONS_FALLBACK















    };















}
























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



+1
−0




























Original line number
Diff line number
Diff line








@@ -418,5 +418,6 @@ public class SecureSettingsValidators {













        VALIDATORS.put(Secure.CREDENTIAL_SERVICE_PRIMARY, NULLABLE_COMPONENT_NAME_VALIDATOR);















        VALIDATORS.put(Secure.AUTOFILL_SERVICE, AUTOFILL_SERVICE_VALIDATOR);















        VALIDATORS.put(Secure.STYLUS_POINTER_ICON_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.CAMERA_EXTENSIONS_FALLBACK, BOOLEAN_VALIDATOR);















    }















}