Merge "Fix Perm issues in STService" into udc-dev am: 5a05b597a3

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

Change-Id: Id1100b36d2b31990fae391dc5ea17f3739331db0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-02-18 01:09:52 +00:00
committed by Automerger Merge Worker

View File

@@ -1647,11 +1647,13 @@ public class SoundTriggerService extends SystemService {
@Override @Override
public List<ModuleProperties> listModuleProperties(Identity originatorIdentity) { public List<ModuleProperties> listModuleProperties(Identity originatorIdentity) {
Identity middlemanIdentity = new Identity(); Identity identity = new Identity();
middlemanIdentity.packageName = ActivityThread.currentOpPackageName(); identity.packageName = ActivityThread.currentOpPackageName();
ArrayList<ModuleProperties> moduleList = new ArrayList<>(); ArrayList<ModuleProperties> moduleList = new ArrayList<>();
SoundTrigger.listModulesAsMiddleman(moduleList, middlemanIdentity, // Overwrite with our own identity to fix permission issues.
originatorIdentity); // VIMService always does its own validation, so this is fine.
// TODO(b/269765333)
SoundTrigger.listModulesAsOriginator(moduleList, identity);
return moduleList; return moduleList;
} }