From 706fbe7ed36354c6fe3f7e67617ce12f2e630e32 Mon Sep 17 00:00:00 2001 From: Tony Mak Date: Tue, 3 Apr 2018 18:49:05 +0100 Subject: [PATCH] We should show custom title for suspend app dialog BUG: 77523074 Test: Suspend an app, observe the new title. Change-Id: I85f3d47e05332f7593a885130fd30dc5fd0a9960 --- core/java/android/app/admin/DevicePolicyManager.java | 7 +++++++ .../com/android/server/am/ActivityStartInterceptor.java | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index b64aae5240b23..f7fb02a54d1f0 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1172,6 +1172,13 @@ public class DevicePolicyManager { */ public static final String POLICY_MANDATORY_BACKUPS = "policy_mandatory_backups"; + /** + * Constant to indicate the feature of suspending app. Use it as the value of + * {@link #EXTRA_RESTRICTION}. + * @hide + */ + public static final String POLICY_SUSPEND_PACKAGES = "policy_suspend_packages"; + /** * A String indicating a specific restricted feature. Can be a user restriction from the * {@link UserManager}, e.g. {@link UserManager#DISALLOW_ADJUST_VOLUME}, or one of the values diff --git a/services/core/java/com/android/server/am/ActivityStartInterceptor.java b/services/core/java/com/android/server/am/ActivityStartInterceptor.java index b86a8a6f2a8dd..2ac389d7bf301 100644 --- a/services/core/java/com/android/server/am/ActivityStartInterceptor.java +++ b/services/core/java/com/android/server/am/ActivityStartInterceptor.java @@ -21,6 +21,8 @@ import static android.app.ActivityOptions.ANIM_OPEN_CROSS_PROFILE_APPS; import static android.app.PendingIntent.FLAG_CANCEL_CURRENT; import static android.app.PendingIntent.FLAG_IMMUTABLE; import static android.app.PendingIntent.FLAG_ONE_SHOT; +import static android.app.admin.DevicePolicyManager.EXTRA_RESTRICTION; +import static android.app.admin.DevicePolicyManager.POLICY_SUSPEND_PACKAGES; import static android.content.Context.KEYGUARD_SERVICE; import static android.content.Intent.EXTRA_INTENT; import static android.content.Intent.EXTRA_PACKAGE_NAME; @@ -214,6 +216,8 @@ class ActivityStartInterceptor { return false; } mIntent = devicePolicyManager.createShowAdminSupportIntent(mUserId, true); + mIntent.putExtra(EXTRA_RESTRICTION, POLICY_SUSPEND_PACKAGES); + mCallingPid = mRealCallingPid; mCallingUid = mRealCallingUid; mResolvedType = null;