PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add DISALLOW_APPS_CONTROL check into uninstall app for all users" into tm-qpr-dev

Browse Source
This commit is contained in:
Yanting Yang
2023-01-07 01:56:05 +00:00
committed by Android (Google) Code Review
parent 2681d8cc05 f3b323e378
commit f43feb6a46
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
View File

@@ -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);