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

Commit 8e423d11 authored by Adam Bookatz's avatar Adam Bookatz
Browse files

SoundTriggerService.startRecognition - callingUser 

SoundTriggerService.startRecognitionForService() uses the calling user
for setting up its RemoteSoundTriggerDetectionService, to inform the
caller of sound trigger events.

However, this method is first clearing the calling id, so when it
fetches the caller's userHandle, it will always get user 0, rather than
the actual caller.

This cl fixes that.

Bug: 341193639
Test: Manual - have an app in user 10 use this service and verify it receives the triggers
Flag: EXEMPT bugfix
Change-Id: I5bcec1797f65d53ff6110241ddd827c2dc4bf894
parent ded22208

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java

+2 −1
Original line number Diff line number Diff line
@@ -687,6 +687,7 @@ public class SoundTriggerService extends SystemService { 
        @Override

        public int startRecognitionForService(ParcelUuid soundModelId, Bundle params,

                ComponentName detectionService, SoundTrigger.RecognitionConfig config) {

            final UserHandle userHandle = Binder.getCallingUserHandle();

            mEventLogger.enqueue(new SessionEvent(Type.START_RECOGNITION_SERVICE,

                        getUuid(soundModelId)));

            try (SafeCloseable ignored = ClearCallingIdentityContext.create()) {
@@ -699,7 +700,7 @@ public class SoundTriggerService extends SystemService { 


                IRecognitionStatusCallback callback =

                        new RemoteSoundTriggerDetectionService(soundModelId.getUuid(), params,

                                detectionService, Binder.getCallingUserHandle(), config);

                                detectionService, userHandle, config);



                synchronized (mLock) {

                    SoundModel soundModel = mLoadedModels.get(soundModelId.getUuid());