diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-05-13 12:25:06 -0700 |
|---|---|---|
| committer | Nicolas Prevot <nprevot@google.com> | 2015-05-13 16:59:34 -0700 |
| commit | 88a8116c6f202ac33504b7e89266813e98c6072e (patch) | |
| tree | cdf0ccfd6ce8cf11cdba407586c27bb4d8a31b96 /src | |
| parent | 99a2bfd8472b595d28da707f76c1624143037198 (diff) | |
| download | android_packages_apps_ManagedProvisioning-88a8116c6f202ac33504b7e89266813e98c6072e.tar.gz android_packages_apps_ManagedProvisioning-88a8116c6f202ac33504b7e89266813e98c6072e.tar.bz2 android_packages_apps_ManagedProvisioning-88a8116c6f202ac33504b7e89266813e98c6072e.zip | |
In ManagedProvisioning, look at canAddMoreManagedProfiles().
Instead of looking at canAddMoreUsers()
Change-Id: I6a3ac63d9c88d2861cb92aa6f015d78054bfd787
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/managedprovisioning/ProfileOwnerPreProvisioningActivity.java | 8 | ||||
| -rw-r--r-- | src/com/android/managedprovisioning/ProfileOwnerProvisioningService.java | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/com/android/managedprovisioning/ProfileOwnerPreProvisioningActivity.java b/src/com/android/managedprovisioning/ProfileOwnerPreProvisioningActivity.java index 50956738..a88cee9b 100644 --- a/src/com/android/managedprovisioning/ProfileOwnerPreProvisioningActivity.java +++ b/src/com/android/managedprovisioning/ProfileOwnerPreProvisioningActivity.java @@ -146,7 +146,7 @@ public class ProfileOwnerPreProvisioningActivity extends SetupLayoutActivity DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE); createDeleteManagedProfileDialog(dpm, existingManagedProfileUserId); - } else if (isMaximumUserLimitReached()) { + } else if (isMaximumManagedProfilesLimitReached()) { showErrorAndClose(R.string.maximum_user_limit_reached, "Exiting managed profile provisioning, cannot add more users."); } else { @@ -184,9 +184,9 @@ public class ProfileOwnerPreProvisioningActivity extends SetupLayoutActivity return pm.hasSystemFeature(PackageManager.FEATURE_MANAGED_USERS); } - private boolean isMaximumUserLimitReached() { + private boolean isMaximumManagedProfilesLimitReached() { UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE); - return !userManager.canAddMoreUsers(); + return !userManager.canAddMoreManagedProfiles(); } private boolean currentLauncherSupportsManagedProfiles() { @@ -447,4 +447,4 @@ public class ProfileOwnerPreProvisioningActivity extends SetupLayoutActivity public void onNavigateNext() { checkEncryptedAndStartProvisioningService(); } -}
\ No newline at end of file +} diff --git a/src/com/android/managedprovisioning/ProfileOwnerProvisioningService.java b/src/com/android/managedprovisioning/ProfileOwnerProvisioningService.java index be4e432c..cc1e1d60 100644 --- a/src/com/android/managedprovisioning/ProfileOwnerProvisioningService.java +++ b/src/com/android/managedprovisioning/ProfileOwnerProvisioningService.java @@ -510,11 +510,7 @@ public class ProfileOwnerProvisioningService extends Service { Process.myUserHandle().getIdentifier()); if (mManagedProfileUserInfo == null) { - if (UserManager.getMaxSupportedUsers() == mUserManager.getUserCount()) { - throw raiseError("Profile creation failed, maximum number of users reached."); - } else { - throw raiseError("Couldn't create profile. Reason unknown."); - } + throw raiseError("Couldn't create profile."); } } |