Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-12 21:14:17 +00:00
committed by Android (Google) Code Review
parent 3a09e0c0d6 c253a493d3
commit 6a4db881db
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
View File

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