Merge "Check for null callback" into tm-dev

2022-03-23 16:36:16 +00:00
parent 8a4163d495 d2185bf42c
commit 1ffa981ea5
1 changed files with 4 additions and 1 deletions
--- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
+++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
@@ -923,7 +923,10 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
        if (modelData != null && modelData.isModelStarted()) {
            modelData.setStoppedLocked();
            try {
-                modelData.getCallback().onRecognitionPaused();
+                IRecognitionStatusCallback callback = modelData.getCallback();
+                if (callback != null) {
+                    callback.onRecognitionPaused();
+                }
            } catch (DeadObjectException e) {
                forceStopAndUnloadModelLocked(modelData, e);
            } catch (RemoteException e) {