diff options
| author | Craig Mautner <cmautner@google.com> | 2013-12-17 16:51:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-17 16:51:58 +0000 |
| commit | 3cf234a639fc134657688050013d071915947f3b (patch) | |
| tree | ff91e81582f7cb2081b8c071d50356f8a616bbd0 /services | |
| parent | c594e9d90465d9d60447ad8aff9d07625474f69c (diff) | |
| parent | 4e09cb9bf6165f68b42549772b74596ceb6198fe (diff) | |
| download | frameworks_base-3cf234a639fc134657688050013d071915947f3b.zip frameworks_base-3cf234a639fc134657688050013d071915947f3b.tar.gz frameworks_base-3cf234a639fc134657688050013d071915947f3b.tar.bz2 | |
am 4e09cb9b: am 38bcf6dc: am 422d7003: am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '4e09cb9bf6165f68b42549772b74596ceb6198fe':
Fix to NullPointerException on move back in ActivityStack.
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index c67e81f..39a93a7 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -3165,9 +3165,7 @@ final class ActivityStack { final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null; if (task == tr && task.mOnTopOfHome || numTasks <= 1) { - if (task != null) { - task.mOnTopOfHome = false; - } + tr.mOnTopOfHome = false; return mStackSupervisor.resumeHomeActivity(null); } |