Merge "skip filtered entries instead of returning" into oc-mr1-dev am: 5ead92fd93 (5248ce61) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -8512,7 +8512,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) {
		@@ -8527,7 +8527,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);
		@@ -8639,7 +8639,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);
		@@ -8665,7 +8665,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);