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

Commit 0b02a41c authored by arangelov's avatar arangelov
Browse files

Add a Settings.Global feature flag to toggle role holder provisioning 

This will be useful for testing.

Bug: 218686349
Test: none
Change-Id: I21c9de56638827beb092eeeb2cdc70940e6377f0
parent c4e5598c

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -16851,6 +16851,14 @@ public final class Settings { 
        public static final String WATCHDOG_TIMEOUT_MILLIS =

                "system_server_watchdog_timeout_ms";













        /**













         * Whether to enable managed device provisioning via the role holder.













         *













         * @hide













         */













        public static final String MANAGED_PROVISIONING_DEFER_PROVISIONING_TO_ROLE_HOLDER =













                "managed_provisioning_defer_provisioning_to_role_holder";



























        /**















         * Settings migrated from Wear OS settings provider.















         * @hide

























core/proto/android/providers/settings/global.proto



+7
−1




























Original line number
Diff line number
Diff line








@@ -574,6 +574,12 @@ message GlobalSettingsProto {





























    optional SettingProto lte_service_forced = 71 [ (android.privacy).dest = DEST_AUTOMATIC ];















    repeated SettingProto max_error_bytes = 151;



























    message ManagedDeviceProvisioning {













        optional SettingProto managed_provisioning_defer_provisioning_to_role_holder = 1;













    }













    optional ManagedDeviceProvisioning managed_device_provisioning = 156;





























    optional SettingProto mdc_initial_max_retry = 72 [ (android.privacy).dest = DEST_AUTOMATIC ];































    message Mhl {










@@ -1077,5 +1083,5 @@ message GlobalSettingsProto {





























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















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













    // Next tag = 156;













    // Next tag = 157;















}
























packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+8
−0




























Original line number
Diff line number
Diff line








@@ -696,6 +696,14 @@ class SettingsProtoDumpUtil {













                Settings.Global.MAX_ERROR_BYTES_PREFIX,















                GlobalSettingsProto.MAX_ERROR_BYTES);





























        final long managedDeviceProvisioningToken =













                p.start(GlobalSettingsProto.MANAGED_DEVICE_PROVISIONING);













        dumpSetting(s, p,













                Settings.Global.MANAGED_PROVISIONING_DEFER_PROVISIONING_TO_ROLE_HOLDER,













                GlobalSettingsProto.ManagedDeviceProvisioning













                        .MANAGED_PROVISIONING_DEFER_PROVISIONING_TO_ROLE_HOLDER);













        p.end(managedDeviceProvisioningToken);





























        final long euiccToken = p.start(GlobalSettingsProto.EUICC);















        dumpSetting(s, p,















                Settings.Global.EUICC_PROVISIONED,

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+1
−0




























Original line number
Diff line number
Diff line








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













                    Settings.Global.KEY_CHORD_POWER_VOLUME_UP,















                    Settings.Global.CLOCKWORK_HOME_READY,















                    Settings.Global.WATCHDOG_TIMEOUT_MILLIS,













                    Settings.Global.MANAGED_PROVISIONING_DEFER_PROVISIONING_TO_ROLE_HOLDER,















                    Settings.Global.Wearable.BATTERY_SAVER_MODE,















                    Settings.Global.Wearable.COMBINED_LOCATION_ENABLED,















                    Settings.Global.Wearable.HAS_PAY_TOKENS,