Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reset identity context in STService" into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-02-21 01:19:49 +00:00
committed by Android (Google) Code Review
parent bd44515f49 a4b3863cff
commit fb0356f7ad
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
View File

@@ -1647,13 +1647,16 @@ public class SoundTriggerService extends SystemService {
@Override
public List<ModuleProperties> listModuleProperties(Identity originatorIdentity) {
Identity identity = new Identity();
identity.packageName = ActivityThread.currentOpPackageName();
ArrayList<ModuleProperties> moduleList = new ArrayList<>();
// 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);
try (SafeCloseable ignored = PermissionUtil.establishIdentityDirect(
originatorIdentity)) {
Identity middlemanIdentity = new Identity();
middlemanIdentity.uid = Binder.getCallingUid();
middlemanIdentity.pid = Binder.getCallingPid();
middlemanIdentity.packageName = ActivityThread.currentOpPackageName();
SoundTrigger.listModulesAsMiddleman(moduleList, middlemanIdentity,
originatorIdentity);
}
return moduleList;
}