Merge "Check for null callback" into tm-dev am: 1ffa981ea5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17300633 Change-Id: I546cff354f78a11994dd2d28afcaf16a9dad0817
This commit is contained in:
@@ -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) {
|
||||||
|
|||||||
Reference in New Issue
Block a user