Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871702 Change-Id: Ic9875331fa1a63feee2d51c4782e8c98df882794 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -408,7 +408,13 @@ public class AppInfoDashboardFragment extends DashboardFragment
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
super.onPrepareOptionsMenu(menu);
|
super.onPrepareOptionsMenu(menu);
|
||||||
menu.findItem(UNINSTALL_ALL_USERS_MENU).setVisible(shouldShowUninstallForAll(mAppEntry));
|
final MenuItem uninstallAllUsersItem = menu.findItem(UNINSTALL_ALL_USERS_MENU);
|
||||||
|
uninstallAllUsersItem.setVisible(
|
||||||
|
shouldShowUninstallForAll(mAppEntry) && !mAppsControlDisallowedBySystem);
|
||||||
|
if (uninstallAllUsersItem.isVisible()) {
|
||||||
|
RestrictedLockUtilsInternal.setMenuItemAsDisabledByAdmin(getActivity(),
|
||||||
|
uninstallAllUsersItem, mAppsControlDisallowedAdmin);
|
||||||
|
}
|
||||||
menu.findItem(ACCESS_RESTRICTED_SETTINGS).setVisible(shouldShowAccessRestrictedSettings());
|
menu.findItem(ACCESS_RESTRICTED_SETTINGS).setVisible(shouldShowAccessRestrictedSettings());
|
||||||
mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
|
mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
|
||||||
final MenuItem uninstallUpdatesItem = menu.findItem(UNINSTALL_UPDATES);
|
final MenuItem uninstallUpdatesItem = menu.findItem(UNINSTALL_UPDATES);
|
||||||
|
Reference in New Issue
Block a user