diff options
| author | Craig Mautner <cmautner@google.com> | 2013-11-14 00:15:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-14 00:15:55 +0000 |
| commit | 1f0f9fa94913198cd79b8d350cf9e8df8001daeb (patch) | |
| tree | 15ac9a47f1a7a05043ec43847e9bdeae5967d62b /services/java/com/android/server | |
| parent | a951fa56f1855cd0337bddacc01e35868c6d66d6 (diff) | |
| parent | ada62fca51d314cefe2c5da4e007df5b9abf320d (diff) | |
| download | frameworks_base-1f0f9fa94913198cd79b8d350cf9e8df8001daeb.zip frameworks_base-1f0f9fa94913198cd79b8d350cf9e8df8001daeb.tar.gz frameworks_base-1f0f9fa94913198cd79b8d350cf9e8df8001daeb.tar.bz2 | |
Merge "Add null pointer check." into klp-dev
Diffstat (limited to 'services/java/com/android/server')
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index fd791f9..0e15261 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -3160,7 +3160,9 @@ final class ActivityStack { final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null; if (task == tr && task.mOnTopOfHome || numTasks <= 1) { - task.mOnTopOfHome = false; + if (task != null) { + task.mOnTopOfHome = false; + } return mStackSupervisor.resumeHomeActivity(null); } |