PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia3fa8931d4278b870ff595d5fa613f58bca38261
This commit is contained in:
Rajeev Kumar
2021-07-04 19:48:23 +00:00
committed by Automerger Merge Worker
parent 6bd9edeb4e dc07fe1ad1
commit 69bd5a4fc5
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
View File

@@ -272,6 +272,11 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
mMetricsFeatureProvider.action( mMetricsFeatureProvider.action(
mActivity, SettingsEnums.ACTION_APP_INFO_FORCE_STOP); mActivity, SettingsEnums.ACTION_APP_INFO_FORCE_STOP);
// force stop // force stop
if (mPm.isPackageStateProtected(mAppEntry.info.packageName, mUserId)) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mActivity,
RestrictedLockUtilsInternal.getDeviceOwner(mActivity));
return;
}
if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) { if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent( RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
mActivity, mAppsControlDisallowedAdmin); mActivity, mAppsControlDisallowedAdmin);