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

Commit cb4edec3 authored by Yanting Yang's avatar Yanting Yang Committed by Android (Google) Code Review
Browse files

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

parents 6e71b35c 18e77f27

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

+7 −1
Original line number Diff line number Diff line
@@ -415,7 +415,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);