summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sid Soundararajan <ssoundar@google.com> 2016-06-29 20:02:51 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-06-29 20:03:06 +0000
commit10b2fee05f3704ee65cd3730c3d0e2cdb5ac26e2 (patch)
treea4df8f7a8b282c4a6117fc8ae0c8f4433be58b9f
parentf66bdf9b577f93485529af7bfe45f3a62a64e950 (diff)
parentf838407e4ad16a918b8b4527088be573f6448d91 (diff)
Merge "Recents: Make sure blacklist checks the package name as well as activity name" into nyc-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
index d5aa69ab3105..37a4948ae8b0 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
@@ -334,8 +334,9 @@ public class SystemServicesProxy {
// NOTE: The order of these checks happens in the expected order of the traversal of the
// tasks
- // Remove the task if it is blacklisted
- if (sRecentsBlacklist.contains(t.realActivity.getClassName())) {
+ // Remove the task if it or it's package are blacklsited
+ if (sRecentsBlacklist.contains(t.realActivity.getClassName()) ||
+ sRecentsBlacklist.contains(t.realActivity.getPackageName())) {
iter.remove();
continue;
}