diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-12-04 10:22:41 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-04 10:23:09 -0800 |
| commit | 56a715ef7af1e8e808ac6274e0456d9731b97e7a (patch) | |
| tree | 80bf00d4ff38ec2823b190896fef883168cf30d5 /core/java/com | |
| parent | efe89f28cbc385fd628defe63f8e2285312987aa (diff) | |
| parent | f98facaf808df28c54101c57097506d5f7709a4a (diff) | |
| download | frameworks_base-56a715ef7af1e8e808ac6274e0456d9731b97e7a.zip frameworks_base-56a715ef7af1e8e808ac6274e0456d9731b97e7a.tar.gz frameworks_base-56a715ef7af1e8e808ac6274e0456d9731b97e7a.tar.bz2 | |
Merge "Fix NPE in StateMachine"
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/util/StateMachine.java | 17 |
1 files changed, 10 insertions, 7 deletions
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); } } |