summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/pm
diff options
context:
space:
mode:
authorScott Mertz <scott@cyngn.com>2016-06-22 14:12:32 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-07-05 16:24:19 -0700
commitfcd88f46525744bf64732828c653c5c9a595c446 (patch)
treefbbb911841b7f236c47db2f71a453fb90d6119d3 /services/core/java/com/android/server/pm
parent95ae413fe5e7f5e8e5e7714cad51b948e3c2c110 (diff)
downloadframeworks_base-fcd88f46525744bf64732828c653c5c9a595c446.zip
frameworks_base-fcd88f46525744bf64732828c653c5c9a595c446.tar.gz
frameworks_base-fcd88f46525744bf64732828c653c5c9a595c446.tar.bz2
am: clear protected apps from recents
Remove newly protected apps from recent tasks if any activity in the stack is a restricted component. FEIJ-1361 Change-Id: Ifd337bfe8356613d098ff00c575db117d35f2017
Diffstat (limited to 'services/core/java/com/android/server/pm')
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 4597031..59ca3c3 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -17302,7 +17302,8 @@ public class PackageManagerService extends IPackageManager.Stub {
//If this component is launched from the system or a uid of a protected component, allow it.
boolean fromProtectedComponentUid = false;
for (String protectedComponentManager : protectedComponentManagers) {
- if (callingUid == getPackageUid(protectedComponentManager, userId)) {
+ int packageUid = getPackageUid(protectedComponentManager, userId);
+ if (packageUid != -1 && callingUid == packageUid) {
fromProtectedComponentUid = true;
}
}