diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-01-29 22:12:42 +0000 |
---|---|---|
committer | Sudheer Shanka <sudheersai@google.com> | 2016-02-01 11:46:48 +0000 |
commit | 5a88832462cc17f685b92b03948b00ab6374a061 (patch) | |
tree | 641d28580f6407a23d66c8da48b96b7f97eaa1c6 /src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java | |
parent | 45554ceba3433d6c71694d30b25b37910a10ceab (diff) | |
download | android_packages_apps_PackageInstaller-5a88832462cc17f685b92b03948b00ab6374a061.tar.gz android_packages_apps_PackageInstaller-5a88832462cc17f685b92b03948b00ab6374a061.tar.bz2 android_packages_apps_PackageInstaller-5a88832462cc17f685b92b03948b00ab6374a061.zip |
Use the correct userId when checking if disabled by admin.
Change-Id: I0fbe8ac8670b9fa4eb1fa35693856b47fdc974a4
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java')
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java index 1af28d67..e1b2f5f1 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java @@ -86,8 +86,6 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple private Callback mOnPermissionsLoadedListener; - private EnforcedAdmin mEnforcedAdmin; - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -102,7 +100,6 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple String groupName = getArguments().getString(Intent.EXTRA_PERMISSION_NAME); mPermissionApps = new PermissionApps(getActivity(), groupName, this); mPermissionApps.refresh(true); - mEnforcedAdmin = RestrictedLockUtils.getProfileOrDeviceOwnerOnCallingUser(getActivity()); } @Override @@ -226,9 +223,11 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple if (existingPref != null) { // If existing preference - only update its state. final boolean isPolicyFixed = app.isPolicyFixed(); + EnforcedAdmin enforcedAdmin = RestrictedLockUtils.getProfileOrDeviceOwner( + getActivity(), app.getUserId()); if (!isTelevision && (existingPref instanceof RestrictedSwitchPreference)) { ((RestrictedSwitchPreference) existingPref).setDisabledByAdmin( - isPolicyFixed ? mEnforcedAdmin : null); + isPolicyFixed ? enforcedAdmin : null); existingPref.setSummary(R.string.disabled_by_admin_summary_text); } else { existingPref.setEnabled(!isPolicyFixed); @@ -248,9 +247,11 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple pref.setKey(app.getKey()); pref.setIcon(app.getIcon()); pref.setTitle(app.getLabel()); + EnforcedAdmin enforcedAdmin = RestrictedLockUtils.getProfileOrDeviceOwner( + getActivity(), app.getUserId()); if (app.isPolicyFixed()) { - if (!isTelevision && mEnforcedAdmin != null) { - pref.setDisabledByAdmin(mEnforcedAdmin); + if (!isTelevision && enforcedAdmin != null) { + pref.setDisabledByAdmin(enforcedAdmin); pref.setSummary(R.string.disabled_by_admin_summary_text); } else { pref.setEnabled(false); |