Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Antoan Angelov
2022-02-14 15:48:37 +00:00
committed by Android (Google) Code Review
parent c20dbd6ceb 0b02a41c3c
commit 332e6894b7
4 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/provider/Settings.java
View File

@@ -16864,6 +16864,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

8
core/proto/android/providers/settings/global.proto
View File

@@ -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;
}

8
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -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,

1
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -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,