From f98facaf808df28c54101c57097506d5f7709a4a Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Tue, 4 Dec 2012 10:16:29 -0800
Subject: Fix NPE in StateMachine

Bug: 7661311
Change-Id: I8645692baf43aced1f4b364bbf13275646754b63
---
 core/java/com/android/internal/util/StateMachine.java | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'core/java/com')

diff --git a/core/java/com/android/internal/util/StateMachine.java b/core/java/com/android/internal/util/StateMachine.java
index 0ede336..3944659 100644
--- a/core/java/com/android/internal/util/StateMachine.java
+++ b/core/java/com/android/internal/util/StateMachine.java
@@ -863,16 +863,19 @@ public class StateMachine {
                 }
             }
 
-            if (mLogRecords.logOnlyTransitions()) {
-                /** Record only if there is a transition */
-                if (destState != null) {
+            // Log only if state machine has not quit
+            if (mSm != null) {
+                if (mLogRecords.logOnlyTransitions()) {
+                    /** Record only if there is a transition */
+                    if (destState != null) {
+                        mLogRecords.add(mMsg, mSm.getLogRecString(mMsg), msgProcessedState,
+                                orgState, destState);
+                    }
+                } else if (recordLogMsg) {
+                    /** Record message */
                     mLogRecords.add(mMsg, mSm.getLogRecString(mMsg), msgProcessedState,
                             orgState, destState);
                 }
-            } else if (recordLogMsg) {
-                /** Record message */
-                mLogRecords.add(mMsg, mSm.getLogRecString(mMsg), msgProcessedState,
-                        orgState, destState);
             }
         }
 
-- 
cgit v1.1