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

Commit d2a16be9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix resource contention in Fake STHAL" into udc-dev am: 773177ad 

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



Change-Id: I0f3f93b778242e3d0ff684e1f5624b61c896c2c0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed44faee 773177ad

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

+3 −1
Original line number Diff line number Diff line
@@ -465,7 +465,9 @@ public class FakeSoundTriggerHal extends ISoundTriggerHw.Stub { 
            if (session == null) {

                Slog.wtf(TAG, "Attempted to start recognition with invalid handle");

            }



            if (mIsResourceContended) {

                throw new ServiceSpecificException(Status.RESOURCE_CONTENTION);

            }

            if (session.getIsUnloaded()) {

                // TODO(b/274470274) this is a deficiency in the existing HAL API, there is no way

                // to handle this race gracefully