Merge "Remove SoundTriggerMiddleware death notification" into tm-qpr-dev am: ee9494914b am: 6f988c39c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19668917 Change-Id: I890054a55f8a8a1b630b44219567c0539bc09c0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1963,7 +1963,6 @@ public class SoundTrigger {
|
||||
}
|
||||
|
||||
private static Object mServiceLock = new Object();
|
||||
private static ISoundTriggerMiddlewareService mService;
|
||||
|
||||
/**
|
||||
* Translate an exception thrown from interaction with the underlying service to an error code.
|
||||
@@ -2217,20 +2216,12 @@ public class SoundTrigger {
|
||||
binder =
|
||||
ServiceManager.getServiceOrThrow(
|
||||
Context.SOUND_TRIGGER_MIDDLEWARE_SERVICE);
|
||||
binder.linkToDeath(() -> {
|
||||
synchronized (mServiceLock) {
|
||||
mService = null;
|
||||
}
|
||||
}, 0);
|
||||
mService = ISoundTriggerMiddlewareService.Stub.asInterface(binder);
|
||||
break;
|
||||
return ISoundTriggerMiddlewareService.Stub.asInterface(binder);
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "Failed to bind to soundtrigger service", e);
|
||||
}
|
||||
}
|
||||
return mService;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user