summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/am
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2016-05-31 16:46:42 -0700
committerAdnan Begovic <adnan@cyngn.com>2016-05-31 16:48:19 -0700
commit9a23f2e7800b99861eb745a04a2e04488788c29a (patch)
tree1897af273490635a981998755cb485a3cd82e645 /services/core/java/com/android/server/am
parentaa238e9fd6c24f279eef6265f50636eb1eef1ece (diff)
downloadframeworks_base-9a23f2e7800b99861eb745a04a2e04488788c29a.zip
frameworks_base-9a23f2e7800b99861eb745a04a2e04488788c29a.tar.gz
frameworks_base-9a23f2e7800b99861eb745a04a2e04488788c29a.tar.bz2
am: clear state for every protected app invocation.
Change-Id: I7766e050b8bedb46ff9293a5d61451e6c998fb0b TICKET: CYNGNOS-2962
Diffstat (limited to 'services/core/java/com/android/server/am')
-rwxr-xr-xservices/core/java/com/android/server/am/ActivityManagerService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index a78b7f1..5a34c7c 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -2205,6 +2205,7 @@ public final class ActivityManagerService extends ActivityManagerNative
try {
Intent protectedAppIntent = new Intent();
+ protectedAppIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
protectedAppIntent.setComponent(
new ComponentName("com.android.settings",
"com.android.settings.applications.ProtectedAppsActivity"));
@@ -2237,6 +2238,8 @@ public final class ActivityManagerService extends ActivityManagerNative
.build();
try {
int[] outId = new int[1];
+ inm.cancelNotificationWithTag("android", null,
+ R.string.notify_package_component_protected_title, msg.arg1);
inm.enqueueNotificationWithTag("android", "android", null,
R.string.notify_package_component_protected_title,
notification, outId, mCurrentUserId);