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

Commit ec87a7cb authored by Nadav Bar's avatar Nadav Bar Committed by Android (Google) Code Review
Browse files

Merge "Add ODI_CAPTIONS_OPTED_OUT to secure settings."

parents bdcd259e b67cb622

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6111,6 +6111,7 @@ package android.provider { 
    field public static final String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS = "lock_screen_allow_private_notifications";

    field public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications";

    field public static final String ODI_CAPTIONS_ENABLED = "odi_captions_enabled";

    field public static final String ODI_CAPTIONS_OPTED_OUT = "odi_captions_opted_out";

    field public static final String THEME_CUSTOMIZATION_OVERLAY_PACKAGES = "theme_customization_overlay_packages";

    field public static final String USER_SETUP_COMPLETE = "user_setup_complete";

    field public static final int USER_SETUP_PERSONALIZATION_COMPLETE = 10; // 0xa

core/java/android/provider/Settings.java

+12 −0
Original line number Diff line number Diff line
@@ -5612,6 +5612,17 @@ public final class Settings { 














        private static final Validator ODI_CAPTIONS_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;



























        /**













         * Setting to indicate that on device captions cannot be shown because the app













         * which is currently playing media had opted out.













         *













         * @hide













         */













        @SystemApi













        public static final String ODI_CAPTIONS_OPTED_OUT = "odi_captions_opted_out";

























        private static final Validator ODI_CAPTIONS_OPTED_OUT_VALIDATOR = BOOLEAN_VALIDATOR;



























        /**















         * On Android 8.0 (API level 26) and higher versions of the platform,















         * a 64-bit number (expressed as a hexadecimal string), unique to










@@ -8979,6 +8990,7 @@ public final class Settings {













            VALIDATORS.put(SILENCE_CALL_GESTURE_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);















            VALIDATORS.put(SILENCE_NOTIFICATION_GESTURE_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);















            VALIDATORS.put(ODI_CAPTIONS_ENABLED, ODI_CAPTIONS_ENABLED_VALIDATOR);













            VALIDATORS.put(ODI_CAPTIONS_OPTED_OUT, ODI_CAPTIONS_OPTED_OUT_VALIDATOR);















        }





























        /**

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -656,6 +656,7 @@ public class SettingsBackupTest {













                 Settings.Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,















                 Settings.Secure.NUM_ROTATION_SUGGESTIONS_ACCEPTED,















                 Settings.Secure.ODI_CAPTIONS_ENABLED,













                 Settings.Secure.ODI_CAPTIONS_OPTED_OUT,















                 Settings.Secure.PACKAGE_VERIFIER_STATE,















                 Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT,















                 Settings.Secure.PARENTAL_CONTROL_LAST_UPDATE,