From 04a474f3f39d71c7b39c4a98c8c3fddefc516d5c Mon Sep 17 00:00:00 2001 From: Atneya Nair Date: Tue, 11 Jul 2023 12:07:09 -0700 Subject: Fix headless package-check issue in soundtrigger Change package/UID check to match against any user to avoid cases where the client app is not installed in SYSTEM_USER (headless) to cause package manager to fail to find the package name and throw a security exception. Bug: 290462753 Bug: 288949320 Test: Assistant in headless mode Change-Id: I8c804314c197890059c9a5d6184a923ce075ce61 --- .../java/com/android/server/soundtrigger/SoundTriggerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java index 997015ff1c08..b3db2dea4a27 100644 --- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java +++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java @@ -365,7 +365,7 @@ public class SoundTriggerService extends SystemService { // Validate package name try { int uid = mPackageManager.getPackageUid(mOriginatorIdentity.packageName, - PackageManager.PackageInfoFlags.of(0)); + PackageManager.PackageInfoFlags.of(PackageManager.MATCH_ANY_USER)); if (!UserHandle.isSameApp(uid, mOriginatorIdentity.uid)) { throw new SecurityException("Uid " + mOriginatorIdentity.uid + " attempted to spoof package name " + -- cgit v1.2.3-59-g8ed1b