| commit | 58418ba518e585a030ae53ddca2ed8a68a8fdbcc | [log] [tgz] |
|---|---|---|
| author | Yanli Wan <yanliwan@google.com> | Mon Jul 06 14:25:14 2020 -0700 |
| committer | Rajeev Kumar <rajekumar@google.com> | Tue Jul 07 17:49:52 2020 +0000 |
| tree | abb81c1929f29f00145e125e38505a1152c196d2 | |
| parent | b624498e1e5a5a5ca448da230552e5dfdc6ebaea [diff] |
Set skipUserSetup to false on financed devices Bug: 159662652 Test: atest ExtrasProvisioningDataParserTest Change-Id: I985e51eda77547daf064fd51e88b1bab54c2cb46 Merged-In: I985e51eda77547daf064fd51e88b1bab54c2cb46 (cherry picked from commit 4305ab7b87f5385e42b91c87632533561f6b2d88)
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)