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

Commit 43b16c47 authored by Rajeev Kumar's avatar Rajeev Kumar Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I39af0d099e45634c19aa8bad49cf980e883d19a9
parents 2bf09021 dc07fe1a

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