From 355f11034d8aa1cbaac5d69e276767cb61ca925f Mon Sep 17 00:00:00 2001 From: Brad Ebinger Date: Mon, 14 Dec 2015 08:46:49 -0800 Subject: [PATCH] Null pointer fix for StateMachine Checks if StateMachine is null before calling callbacks. Bug-Id: 26176787 Change-Id: I7ee92326e99e18a3b7045ccf098b52acfaff9a15 --- core/java/com/android/internal/util/StateMachine.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/java/com/android/internal/util/StateMachine.java b/core/java/com/android/internal/util/StateMachine.java index 8c4d078ecd78..406b487f643d 100644 --- a/core/java/com/android/internal/util/StateMachine.java +++ b/core/java/com/android/internal/util/StateMachine.java @@ -778,8 +778,11 @@ public class StateMachine { */ @Override public final void handleMessage(Message msg) { - mSm.onPreHandleMessage(msg); if (!mHasQuit) { + if (mSm != null) { + mSm.onPreHandleMessage(msg); + } + if (mDbg) mSm.log("handleMessage: E msg.what=" + msg.what); /** Save the current message */ @@ -803,8 +806,11 @@ public class StateMachine { // We need to check if mSm == null here as we could be quitting. if (mDbg && mSm != null) mSm.log("handleMessage: X"); + + if (mSm != null) { + mSm.onPostHandleMessage(msg); + } } - mSm.onPostHandleMessage(msg); } /** -- 2.11.0