Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ab25b8b authored by Yanting Yang's avatar Yanting Yang Committed by Automerger Merge Worker
Browse files

Merge "Add DISALLOW_APPS_CONTROL check into uninstall app for all users" into... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871682



Change-Id: I884e3ce1ba968181da190fbf2ec1196f4894c4a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da53b291 f43feb6a

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

+7 −1
Original line number Diff line number Diff line
@@ -408,7 +408,13 @@ public class AppInfoDashboardFragment extends DashboardFragment 
            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);