commit f43feb6a46dd94895e99c176e5b997984cfd0f9d
author Yanting Yang <yantingyang@google.com> Sat Jan 07 01:56:05 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 07 01:56:05 2023 +0000
tree 40b66ba58d8ca28ad8368bdac9d7a396130a1e2e
parent 2681d8cc05e3d0616cf16820112db3869ac46f33
parent f3b323e378ee5d98875711216cbd92f4fa795fc0

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

src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java

diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
index 18cb4b3..54455d4 100755
--- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
+++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
@@ -408,7 +408,13 @@
             return;
         }
         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());
         mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
         final MenuItem uninstallUpdatesItem = menu.findItem(UNINSTALL_UPDATES);