diff options
author | Fyodor Kupolov <fkupolov@google.com> | 2016-04-18 16:45:27 -0700 |
---|---|---|
committer | Fyodor Kupolov <fkupolov@google.com> | 2016-04-18 17:46:29 -0700 |
commit | 933915289a0a023937dff88f49c82122f8e59f51 (patch) | |
tree | 340e10bf6b16e464c774574c79f06b203dcb2eac /src | |
parent | 0fa9b50bab2261bd03c892293554f32c9d710926 (diff) | |
download | android_packages_apps_PackageInstaller-933915289a0a023937dff88f49c82122f8e59f51.tar.gz android_packages_apps_PackageInstaller-933915289a0a023937dff88f49c82122f8e59f51.tar.bz2 android_packages_apps_PackageInstaller-933915289a0a023937dff88f49c82122f8e59f51.zip |
Fix misleading uninstall message for managed profiles
The message now depends on the state of mAllUsers flag in
UninstallAppProgress activity:
- This app is required for some users or profiles and was uninstalled for
others (if mAllUsers==true)
- This app is needed for your work profile and can't be uninstalled
(if mAllUsers==false)
Bug: 28240714
Change-Id: Ia060aebd112d3e4c5fcaee02a777140f085abf87
Diffstat (limited to 'src')
-rwxr-xr-x | src/com/android/packageinstaller/UninstallAppProgress.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/packageinstaller/UninstallAppProgress.java b/src/com/android/packageinstaller/UninstallAppProgress.java index 3a178273..07276334 100755 --- a/src/com/android/packageinstaller/UninstallAppProgress.java +++ b/src/com/android/packageinstaller/UninstallAppProgress.java @@ -211,7 +211,9 @@ public class UninstallAppProgress extends Activity implements OnClickListener { + msg.arg1 + " no blocking user"); statusText = getString(R.string.uninstall_failed); } else { - statusText = getString(R.string.uninstall_blocked_profile_owner); + statusText = mAllUsers + ? getString(R.string.uninstall_all_blocked_profile_owner) : + getString(R.string.uninstall_blocked_profile_owner); } break; } |