Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS... (f6e715f9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActiveServices.java

+27 −4

Original line number	Diff line number	Diff line
		@@ -5992,11 +5992,17 @@ public final class ActiveServices {
		}

		if (ret == REASON_DENIED) {
		if (verifyPackage(callingPackage, callingUid)) {
		final boolean isAllowedPackage =
		mAllowListWhileInUsePermissionInFgs.contains(callingPackage);
		if (isAllowedPackage) {
		ret = REASON_ALLOWLISTED_PACKAGE;
		}
		} else {
		EventLog.writeEvent(0x534e4554, "215003903", callingUid,
		"callingPackage:" + callingPackage + " does not belong to callingUid:"
		+ callingUid);
		}
		}

		if (ret == REASON_DENIED) {
		@@ -6378,4 +6384,21 @@ public final class ActiveServices {
		/* allowBackgroundActivityStarts */ false)
		!= REASON_DENIED;
		}

		/**
		* Checks if a given packageName belongs to a given uid.
		* @param packageName the package of the caller
		* @param uid the uid of the caller
		* @return true or false
		*/
		private boolean verifyPackage(String packageName, int uid) {
		if (uid == ROOT_UID \|\| uid == SYSTEM_UID) {
		//System and Root are always allowed
		return true;
		}
		final int userId = UserHandle.getUserId(uid);
		final int packageUid = mAm.getPackageManagerInternal()
		.getPackageUid(packageName, PackageManager.MATCH_DEBUG_TRIAGED_MISSING, userId);
		return UserHandle.isSameApp(uid, packageUid);
		}
		}