Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb0356f7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents bd44515f a4b3863c
Loading
Loading
Loading
Loading
+9 −6
Original line number Diff line number Diff line
@@ -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;
        }