From 6da7746a180197c087179e4aab121b1a9223b921 Mon Sep 17 00:00:00 2001 From: Atneya Nair Date: Thu, 16 Feb 2023 17:32:16 -0800 Subject: [PATCH] Fix Perm issues in STService Temporary fix to avoid spurious permission issues in middleware service until the permission utilities are fixed properly. VIMService does its own permission gating, so we aren't losing any checks. Bug: 269765333 Test: AGSA starts recognition successfully Change-Id: Ifa6368f54d2f0f782183fd77036953bddbc02172 --- .../server/soundtrigger/SoundTriggerService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java index 495a433701638..1400886665362 100644 --- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java +++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java @@ -1647,11 +1647,13 @@ public class SoundTriggerService extends SystemService { @Override public List listModuleProperties(Identity originatorIdentity) { - Identity middlemanIdentity = new Identity(); - middlemanIdentity.packageName = ActivityThread.currentOpPackageName(); + Identity identity = new Identity(); + identity.packageName = ActivityThread.currentOpPackageName(); ArrayList moduleList = new ArrayList<>(); - SoundTrigger.listModulesAsMiddleman(moduleList, middlemanIdentity, - originatorIdentity); + // Overwrite with our own identity to fix permission issues. + // VIMService always does its own validation, so this is fine. + // TODO(b/269765333) + SoundTrigger.listModulesAsOriginator(moduleList, identity); return moduleList; }