drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 38bcf6dc: am 422d7003: am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."

Browse Source 
* commit '38bcf6dc8784625eb4b68634450c578719346669':
  Fix to NullPointerException on move back in ActivityStack.
This commit is contained in:
Craig Mautner
2013-12-17 16:48:46 +00:00
committed by Android Git Automerger
parent 1ba5915dd0 38bcf6dc87
commit 4e09cb9bf6
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

@ -3147,9 +3147,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);
} }