diff options
| author | Xiaohui Chen <xiaohuic@google.com> | 2015-11-04 17:41:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-11-04 17:41:18 +0000 |
| commit | b2d290effef5fe0fd2a611e5e565ba6e5b9981a4 (patch) | |
| tree | dbe408216aacd5985140489a1579b40b27c1eae5 /src/com/android | |
| parent | b1daeb40c62118ebe4f4dab4de01efc865894096 (diff) | |
| parent | 5db294cd2071a52308db15411cce56e005064962 (diff) | |
| download | android_packages_apps_PackageInstaller-b2d290effef5fe0fd2a611e5e565ba6e5b9981a4.tar.gz android_packages_apps_PackageInstaller-b2d290effef5fe0fd2a611e5e565ba6e5b9981a4.tar.bz2 android_packages_apps_PackageInstaller-b2d290effef5fe0fd2a611e5e565ba6e5b9981a4.zip | |
Merge "Clean up USER_OWNER in PackageInstaller"
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) { |