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

Commit dc07fe1a authored by Rajeev Kumar's avatar Rajeev Kumar Committed by Android (Google) Code Review
Browse files

Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev

parents 010ea548 796ce5ee

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

+5 −0
Original line number Diff line number Diff line
@@ -272,6 +272,11 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp 
             mMetricsFeatureProvider.action(

                     mActivity, SettingsEnums.ACTION_APP_INFO_FORCE_STOP);

            // force stop

            if (mPm.isPackageStateProtected(mAppEntry.info.packageName, mUserId)) {

                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mActivity,

                        RestrictedLockUtilsInternal.getDeviceOwner(mActivity));

                return;

            }

            if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {

                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(

                        mActivity, mAppsControlDisallowedAdmin);