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

Reset identity context in STService

Browse Source 
Middleware service uses binder identity to validate permissions.

For now, clear the binder identity before calling downwards.

In the future, remove this behavior in middleware service.

Test: AGSA starts recognition successfully
Bug: 269765333
Change-Id: Ie33ffbbb6d2aa84d3da9ec6f5f8af0ab3a12af75
This commit is contained in:
Atneya Nair
2023-02-17 16:50:22 -08:00
parent 6da7746a18
commit a4b3863cff
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;
}