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

2021-07-04 19:14:33 +00:00
parent 010ea5488d 796ce5ee10
commit dc07fe1ad1
1 changed files with 5 additions and 0 deletions
--- a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
@@ -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);