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 am: 6a4db881db

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23214158

Change-Id: Ie37cb73b4064d5e2a233f628b42fbf8a23af89dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-12 22:05:01 +00:00
committed by Automerger Merge Worker
parent a1c5251bcf 6a4db881db
commit 7ea58c221e
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 {
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: "