Merge "Add the checking of the package installed state" (b02241fa) · Commits · e / os / android_frameworks_base

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

+8 −10

Original line number	Diff line number	Diff line
		@@ -4239,12 +4239,12 @@ public class PackageManagerService extends IPackageManager.Stub
		// reader
		final AndroidPackage p = mPackages.get(packageName);
		if (p != null && AndroidPackageUtils.isMatchForSystemOnly(p, flags)) {
		PackageSetting ps = getPackageSettingInternal(p.getPackageName(), callingUid);
		if (shouldFilterApplicationLocked(ps, callingUid, userId)) {
		return -1;
		}
		final PackageSetting ps = getPackageSettingInternal(p.getPackageName(), callingUid);
		if (ps != null && ps.getInstalled(userId)
		&& !shouldFilterApplicationLocked(ps, callingUid, userId)) {
		return UserHandle.getUid(userId, p.getUid());
		}
		}
		if ((flags & MATCH_KNOWN_PACKAGES) != 0) {
		final PackageSetting ps = mSettings.getPackageLPr(packageName);
		if (ps != null && ps.isMatch(flags)
		@@ -7963,14 +7963,12 @@ public class PackageManagerService extends IPackageManager.Stub
		synchronized (mLock) {
		final AndroidPackage p = mPackages.get(packageName);
		if (p != null && AndroidPackageUtils.isMatchForSystemOnly(p, flags)) {
		PackageSetting ps = getPackageSetting(p.getPackageName());
		if (shouldFilterApplicationLocked(ps, callingUid, userId)) {
		return null;
		}
		// TODO: Shouldn't this be checking for package installed state for userId and
		// return null?
		final PackageSetting ps = getPackageSetting(p.getPackageName());
		if (ps != null && ps.getInstalled(userId)
		&& !shouldFilterApplicationLocked(ps, callingUid, userId)) {
		return mPermissionManager.getGidsForUid(UserHandle.getUid(userId, ps.appId));
		}
		}
		if ((flags & MATCH_KNOWN_PACKAGES) != 0) {
		final PackageSetting ps = mSettings.getPackageLPr(packageName);
		if (ps != null && ps.isMatch(flags)