diff options
| author | Xiaohui Chen <xiaohuic@google.com> | 2015-10-20 14:49:13 -0700 |
|---|---|---|
| committer | Xiaohui Chen <xiaohuic@google.com> | 2015-11-03 15:04:15 -0800 |
| commit | 5db294cd2071a52308db15411cce56e005064962 (patch) | |
| tree | ed9254ea3c8d79a1988671d10e1fdfff1dcd64e2 /src/com/android | |
| parent | fdeb75012b820bb86e26d05ea288762798128b7b (diff) | |
| download | android_packages_apps_PackageInstaller-5db294cd2071a52308db15411cce56e005064962.tar.gz android_packages_apps_PackageInstaller-5db294cd2071a52308db15411cce56e005064962.tar.bz2 android_packages_apps_PackageInstaller-5db294cd2071a52308db15411cce56e005064962.zip | |
Clean up USER_OWNER in PackageInstaller
Bug: 25086442
Change-Id: Ia7d81a93f1888d7b9602a94aebfc89433e89d040
Diffstat (limited to 'src/com/android')
| -rwxr-xr-x | src/com/android/packageinstaller/UninstallAppProgress.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/packageinstaller/UninstallAppProgress.java b/src/com/android/packageinstaller/UninstallAppProgress.java index d6b788d4..4c039051 100755 --- a/src/com/android/packageinstaller/UninstallAppProgress.java +++ b/src/com/android/packageinstaller/UninstallAppProgress.java @@ -181,7 +181,8 @@ public class UninstallAppProgress extends Activity implements OnClickListener { } else { mDeviceManagerButton.setVisibility(View.GONE); } - if (blockingUserId == UserHandle.USER_OWNER) { + // TODO: b/25442806 + if (blockingUserId == UserHandle.USER_SYSTEM) { statusText = getString(R.string.uninstall_blocked_device_owner); } else if (blockingUserId == UserHandle.USER_NULL) { Log.d(TAG, "Uninstall failed for " + packageName + " with code " @@ -216,8 +217,8 @@ public class UninstallAppProgress extends Activity implements OnClickListener { Intent intent = getIntent(); mAppInfo = intent.getParcelableExtra(PackageUtil.INTENT_ATTR_APPLICATION_INFO); mAllUsers = intent.getBooleanExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, false); - if (mAllUsers && UserHandle.myUserId() != UserHandle.USER_OWNER) { - throw new SecurityException("Only owner user can request uninstall for all users"); + if (mAllUsers && !UserManager.get(this).isAdminUser()) { + throw new SecurityException("Only admin user can request uninstall for all users"); } mUser = intent.getParcelableExtra(Intent.EXTRA_USER); if (mUser == null) { |