Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix to NullPointerException on move back in ActivityStack."

Browse Source
This commit is contained in:
Craig Mautner
2013-12-17 16:36:44 +00:00
committed by Gerrit Code Review
parent 5d6332e374 9cdf9e52d9
commit f431daa228
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/am/ActivityStack.java
View File

@@ -3160,9 +3160,7 @@ final class ActivityStack {
final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null; final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null;
if (task == tr && task.mOnTopOfHome || numTasks <= 1) { if (task == tr && task.mOnTopOfHome || numTasks <= 1) {
if (task != null) { tr.mOnTopOfHome = false;
task.mOnTopOfHome = false;
}
return mStackSupervisor.resumeHomeActivity(null); return mStackSupervisor.resumeHomeActivity(null);
} }