Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove SoundTriggerMiddleware death notification" into tm-qpr-dev am: ee9494914b

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

Change-Id: I16b18ee3086f1d249da3f490bef7899a2e81a5f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-08-19 20:42:23 +00:00
committed by Automerger Merge Worker
parent c07ce1640f ee9494914b
commit 6f988c39c5
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/hardware/soundtrigger/SoundTrigger.java
View File

@@ -1963,7 +1963,6 @@ public class SoundTrigger {
} }
private static Object mServiceLock = new Object(); private static Object mServiceLock = new Object();
private static ISoundTriggerMiddlewareService mService;
/** /**
* Translate an exception thrown from interaction with the underlying service to an error code. * Translate an exception thrown from interaction with the underlying service to an error code.
@@ -2217,20 +2216,12 @@ public class SoundTrigger {
binder = binder =
ServiceManager.getServiceOrThrow( ServiceManager.getServiceOrThrow(
Context.SOUND_TRIGGER_MIDDLEWARE_SERVICE); Context.SOUND_TRIGGER_MIDDLEWARE_SERVICE);
binder.linkToDeath(() -> { return ISoundTriggerMiddlewareService.Stub.asInterface(binder);
synchronized (mServiceLock) {
mService = null;
}
}, 0);
mService = ISoundTriggerMiddlewareService.Stub.asInterface(binder);
break;
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Failed to bind to soundtrigger service", e); Log.e(TAG, "Failed to bind to soundtrigger service", e);
} }
} }
return mService;
} }
} }
/** /**