Snap for 7522506 from 69bd5a4fc5 to sc-v2-release

Change-Id: I7566dba292338ad1c4c4ca1a30b99f6928c722eb
2021-07-04 23:13:36 +00:00
parent aefd5eb37e 69bd5a4fc5
commit f75971d762
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);