summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-04-13 20:28:04 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-04-13 20:28:04 +0000
commit54ac73986063eea1bb06c4a5d1505a8cd9b39787 (patch)
tree4c7f39ae735cb3626bf509db994de211b95c33d6
parent60e1d5327c6c6f754160647b30548958a973f52a (diff)
parent65736e40df7f60bb16e57dfe81e4e18d522df8fa (diff)
downloadbase-54ac73986063eea1bb06c4a5d1505a8cd9b39787.tar.gz
Merge "skip filtered entries instead of returning" into oreo-dev
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 70f6a04d9a21..6d8095b89408 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -8077,7 +8077,7 @@ public class PackageManagerService extends IPackageManager.Stub
continue;
}
if (filterAppAccessLPr(ps, callingUid, userId)) {
- return null;
+ continue;
}
final PackageInfo pi = generatePackageInfo(ps, flags, userId);
if (pi != null) {
@@ -8092,7 +8092,7 @@ public class PackageManagerService extends IPackageManager.Stub
continue;
}
if (filterAppAccessLPr(ps, callingUid, userId)) {
- return null;
+ continue;
}
final PackageInfo pi = generatePackageInfo((PackageSetting)
p.mExtras, flags, userId);
@@ -8204,7 +8204,7 @@ public class PackageManagerService extends IPackageManager.Stub
continue;
}
if (filterAppAccessLPr(ps, callingUid, userId)) {
- return null;
+ continue;
}
ai = PackageParser.generateApplicationInfo(ps.pkg, effectiveFlags,
ps.readUserState(userId), userId);
@@ -8230,7 +8230,7 @@ public class PackageManagerService extends IPackageManager.Stub
continue;
}
if (filterAppAccessLPr(ps, callingUid, userId)) {
- return null;
+ continue;
}
ApplicationInfo ai = PackageParser.generateApplicationInfo(p, flags,
ps.readUserState(userId), userId);