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

Commit 8940f104 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add a SettingsProvider key for Adaptive connectivity" into rvc-qpr-dev am: b0df5801 

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

Change-Id: I7421c1f07d89d1b7c5371c83ed8a94f7f4ae9c71
parents 35d81ecd b0df5801

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -8965,6 +8965,13 @@ public final class Settings { 
         */

        public static final int ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW = 0x2;













        /**













         * Whether the Adaptive connectivity option is enabled.













         *













         * @hide













         */













        public static final String ADAPTIVE_CONNECTIVITY_ENABLED = "adaptive_connectivity_enabled";



























        /**















         * Keys we no longer back up under the current schema, but want to continue to















         * process when restoring historical backup datasets.

































core/proto/android/app/settings_enums.proto



+5
−0




























Original line number
Diff line number
Diff line








@@ -2683,4 +2683,9 @@ enum PageId {













    // CATEGORY: SETTINGS















    // OS: R















    MEDIA_CONTROLS_SETTINGS = 1845;



























    // OPEN: Settings > Network & internet > Adaptive connectivity













    // CATEGORY: SETTINGS













    // OS: R QPR













    ADAPTIVE_CONNECTIVITY_CATEGORY = 1850;















}
























core/proto/android/providers/settings/secure.proto



+2
−1




























Original line number
Diff line number
Diff line








@@ -180,6 +180,7 @@ message SecureSettingsProto {













    optional SettingProto cmas_additional_broadcast_pkg = 14 [ (android.privacy).dest = DEST_AUTOMATIC ];















    repeated SettingProto completed_categories = 15;















    optional SettingProto connectivity_release_pending_intent_delay_ms = 16 [ (android.privacy).dest = DEST_AUTOMATIC ];













    optional SettingProto adaptive_connectivity_enabled = 84 [ (android.privacy).dest = DEST_AUTOMATIC ];































    message Controls {















        option (android.msg_privacy).dest = DEST_EXPLICIT;










@@ -595,5 +596,5 @@ message SecureSettingsProto {





























    // Please insert fields in alphabetical order and group them into messages















    // if possible (to avoid reaching the method limit).













    // Next tag = 82;













    // Next tag = 85;















}
























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



+2
−1




























Original line number
Diff line number
Diff line








@@ -167,6 +167,7 @@ public class SecureSettings {













        Settings.Secure.MEDIA_CONTROLS_RESUME,















        Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED,















        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE,













        Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS













        Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS,













        Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED















    };















}
























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



+1
−0




























Original line number
Diff line number
Diff line








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













        VALIDATORS.put(















                Secure.ACCESSIBILITY_BUTTON_TARGETS,















                ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);













        VALIDATORS.put(Secure.ADAPTIVE_CONNECTIVITY_ENABLED, BOOLEAN_VALIDATOR);















    }















}