commit | 8fcd2841bca83488d08907174050ff85f35686d2 | [log] [tgz] |
---|---|---|
author | Yanli Wan <yanliwan@google.com> | Fri Jul 10 09:13:25 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 10 09:13:25 2020 +0000 |
tree | 9c4a43c242bf92beb925b218c7cdad5894a33e18 | |
parent | 7b04bd9e1a493ac02079f8a7f639fcd8c5288ced [diff] | |
parent | 58418ba518e585a030ae53ddca2ed8a68a8fdbcc [diff] |
Set skipUserSetup to false on financed devices am: 58418ba518 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ManagedProvisioning/+/12098990 Change-Id: Ifb40c05ce8c1ace2166f1c84443c2dd763265993
diff --git a/src/com/android/managedprovisioning/parser/ExtrasProvisioningDataParser.java b/src/com/android/managedprovisioning/parser/ExtrasProvisioningDataParser.java index f6b9922..f3879ad 100644 --- a/src/com/android/managedprovisioning/parser/ExtrasProvisioningDataParser.java +++ b/src/com/android/managedprovisioning/parser/ExtrasProvisioningDataParser.java
@@ -554,6 +554,8 @@ skipUserSetup = getBooleanExtraFromLongName( intent, EXTRA_PROVISIONING_SKIP_USER_SETUP, ProvisioningParams.DEFAULT_SKIP_USER_SETUP); + } else if (isFinancedDeviceProvisioning) { + skipUserSetup = false; } // Only current DeviceOwner can specify EXTRA_PROVISIONING_SKIP_USER_CONSENT when
diff --git a/tests/instrumentation/src/com/android/managedprovisioning/parser/ExtrasProvisioningDataParserTest.java b/tests/instrumentation/src/com/android/managedprovisioning/parser/ExtrasProvisioningDataParserTest.java index 56121b9..5c61a83 100644 --- a/tests/instrumentation/src/com/android/managedprovisioning/parser/ExtrasProvisioningDataParserTest.java +++ b/tests/instrumentation/src/com/android/managedprovisioning/parser/ExtrasProvisioningDataParserTest.java
@@ -342,6 +342,8 @@ .setKeepAccountMigrated(false) // THEN leave all system apps is always true .setLeaveAllSystemAppsEnabled(true) + // THEN skip user setup is always false + .setSkipUserSetup(false) .setAdminExtrasBundle(createTestAdminExtras()) .setDeviceAdminLabel(TEST_DEVICE_ADMIN_PACKAGE_LABEL) .setOrganizationName(TEST_ORGANIZATION_NAME)