diff options
| author | Craig Mautner <cmautner@google.com> | 2013-12-17 16:45:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-17 16:45:06 +0000 |
| commit | 38bcf6dc8784625eb4b68634450c578719346669 (patch) | |
| tree | 336f8f6285f4aa2b21eee6e0d3873f8358614dd1 /services/java/com/android/server | |
| parent | a759b3d2b4c822a735a3a023be9b484cc05e0b19 (diff) | |
| parent | 422d7003db8d26b5fa503aa294348d7b53621db1 (diff) | |
| download | frameworks_base-38bcf6dc8784625eb4b68634450c578719346669.zip frameworks_base-38bcf6dc8784625eb4b68634450c578719346669.tar.gz frameworks_base-38bcf6dc8784625eb4b68634450c578719346669.tar.bz2 | |
am 422d7003: am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '422d7003db8d26b5fa503aa294348d7b53621db1':
Fix to NullPointerException on move back in ActivityStack.
Diffstat (limited to 'services/java/com/android/server')
| -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 84cedb8..47593f2 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -3160,9 +3160,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); } |