Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ea58c22 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Filter out user handle in ST package check" into udc-dev am: 6a4db881 

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



Change-Id: Ie37cb73b4064d5e2a233f628b42fbf8a23af89dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1c5251b 6a4db881

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java

+4 −4
Original line number Diff line number Diff line
@@ -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: "