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

Commit 71fdd608 authored by Ytai Ben-tsvi's avatar Ytai Ben-tsvi Committed by Automerger Merge Worker
Browse files

Merge "Check for null callback" into tm-dev am: 1ffa981e 

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

Change-Id: I546cff354f78a11994dd2d28afcaf16a9dad0817
parents d370f3b3 1ffa981e

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -923,7 +923,10 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { 
        if (modelData != null && modelData.isModelStarted()) {

        if (modelData != null && modelData.isModelStarted()) {

            modelData.setStoppedLocked();

            modelData.setStoppedLocked();

            try {

            try {

                modelData.getCallback().onRecognitionPaused();

                IRecognitionStatusCallback callback = modelData.getCallback();

                if (callback != null) {

                    callback.onRecognitionPaused();

                }

            } catch (DeadObjectException e) {

            } catch (DeadObjectException e) {

                forceStopAndUnloadModelLocked(modelData, e);

                forceStopAndUnloadModelLocked(modelData, e);

            } catch (RemoteException e) {

            } catch (RemoteException e) {