commit | 01ae62abd839e76ac40c5d8fd0d9b3429a9a00b6 | [log] [tgz] |
---|---|---|
author | android-build-team Robot <android-build-team-robot@google.com> | Sat Jul 11 01:14:51 2020 +0000 |
committer | android-build-team Robot <android-build-team-robot@google.com> | Sat Jul 11 01:14:51 2020 +0000 |
tree | abb81c1929f29f00145e125e38505a1152c196d2 | |
parent | 1b7f55f276c69f6f447995409a181878caed55da [diff] | |
parent | 58418ba518e585a030ae53ddca2ed8a68a8fdbcc [diff] |
Snap for 6671561 from 58418ba518e585a030ae53ddca2ed8a68a8fdbcc to rvc-release Change-Id: I6cae7991f4f744cec57f899ffea1c59ab82e645c
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)