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

Commit 1ca18545 authored by Atneya Nair's avatar Atneya Nair Committed by Automerger Merge Worker
Browse files

Merge changes Ibf61fe8f,I127e1a2c into udc-dev am: fccfd4de 

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



Change-Id: Ife967ea4c34535281599abf54322a1463a37b321
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c95e7e25 fccfd4de

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

+6 −5
Original line number Diff line number Diff line
@@ -296,7 +296,10 @@ public class SoundTriggerService extends SystemService { 


    // Helper to add session logger to the capacity limited detached list.

    // If we are at capacity, remove the oldest, and retry

    private void addDetachedSessionLogger(EventLogger logger) {

    private void detachSessionLogger(EventLogger logger) {

        if (!mSessionEventLoggers.remove(logger)) {

            return;

        }

        // Attempt to push to the top of the queue

        while (!mDetachedSessionEventLoggers.offerFirst(logger)) {

            // Remove the oldest element, if one still exists
@@ -872,8 +875,7 @@ public class SoundTriggerService extends SystemService { 


        private void detach() {

            mSoundTriggerHelper.detach();

            mSessionEventLoggers.remove(mEventLogger);

            addDetachedSessionLogger(mEventLogger);

            detachSessionLogger(mEventLogger);

        }



        private void enforceCallingPermission(String permission) {
@@ -1659,8 +1661,7 @@ public class SoundTriggerService extends SystemService { 


            private void detachInternal() {

                mEventLogger.enqueue(new SessionEvent(Type.DETACH, null));

                mSessionEventLoggers.remove(mEventLogger);

                addDetachedSessionLogger(mEventLogger);

                detachSessionLogger(mEventLogger);

                mSoundTriggerHelper.detach();

            }

        }

services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewarePermission.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class SoundTriggerMiddlewarePermission implements ISoundTriggerMiddleware 
    public @NonNull

    SoundTriggerModuleDescriptor[] listModules() {

        Identity identity = getIdentity();

        enforcePermissionsForPreflight(identity);

        enforcePermissionForPreflight(mContext, identity, CAPTURE_AUDIO_HOTWORD);

        return mDelegate.listModules();

    }