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

Commit 8493e9d0 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Fix bug in registering death listener" into rvc-dev am:... 

Merge "Merge "Fix bug in registering death listener" into rvc-dev am: bff8230a am: b2cd9f9a" into rvc-d1-dev-plus-aosp am: 736aaf39 am: 94761f41

Change-Id: I650db0f29db74fc14d40bc4ccc678610aaf9bbe8
parents 23b3278b 94761f41

services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareValidation.java

+2 −2
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ public class SoundTriggerMiddlewareValidation implements ISoundTriggerMiddleware 
            mCallback = callback;

            mHandle = handle;

            try {

                mCallback.asBinder().linkToDeath(null, 0);

                mCallback.asBinder().linkToDeath(this, 0);

            } catch (RemoteException e) {

                throw e.rethrowAsRuntimeException();

            }
@@ -680,7 +680,7 @@ public class SoundTriggerMiddlewareValidation implements ISoundTriggerMiddleware 
            try {

                mDelegate.detach();

                mDelegate = null;

                mCallback.asBinder().unlinkToDeath(null, 0);

                mCallback.asBinder().unlinkToDeath(this, 0);

                mModules.get(mHandle).remove(this);

            } catch (RemoteException e) {

                throw e.rethrowAsRuntimeException();