Merge "Filter out user handle in ST package check" into udc-dev

This commit is contained in:
Treehugger Robot
2023-05-12 21:14:17 +00:00
committed by Android (Google) Code Review

View File

@@ -366,10 +366,10 @@ public class SoundTriggerService extends SystemService {
try {
int uid = mPackageManager.getPackageUid(mOriginatorIdentity.packageName,
PackageManager.PackageInfoFlags.of(0));
if (uid != mOriginatorIdentity.uid) {
throw new SecurityException("Package name: " +
mOriginatorIdentity.packageName + "with uid: " + uid
+ "attempted to spoof as: " + mOriginatorIdentity.uid);
if (!UserHandle.isSameApp(uid, mOriginatorIdentity.uid)) {
throw new SecurityException("Uid " + mOriginatorIdentity.uid +
" attempted to spoof package name " +
mOriginatorIdentity.packageName + " with uid: " + uid);
}
} catch (PackageManager.NameNotFoundException e) {
throw new SecurityException("Package name not found: "