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

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

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

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



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

core/java/android/hardware/soundtrigger/SoundTrigger.java

+1 −10
Original line number Original line Diff line number Diff line
@@ -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;

        }

        }



    }

    }





    /**

    /**