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

Commit 68f92476 authored by Atneya Nair's avatar Atneya Nair Committed by Automerger Merge Worker
Browse files

Merge "Catch STHAL factory exceptions" into udc-dev am: 4d1298ee am: 863cc6d3 am: b20b276f 

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



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

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

+12 −3
Original line number Diff line number Diff line
@@ -168,9 +168,18 @@ class SoundTriggerModule implements IBinder.DeathRecipient, ISoundTriggerHal.Glo 
     * Attached to the HAL service via factory.

     */

    private void attachToHal() {

        mHalService = null;

        while (mHalService == null) {

            try {

                mHalService = new SoundTriggerHalEnforcer(

                        new SoundTriggerHalWatchdog(

                            new SoundTriggerDuplicateModelHandler(mHalFactory.create())));

            } catch (RuntimeException e) {

                if (!(e.getCause() instanceof RemoteException)) {

                    throw e;

                }

            }

        }

        mHalService.linkToDeath(this);

        mHalService.registerCallback(this);

        mProperties = mHalService.getProperties();