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

am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."

Browse Source 
* commit 'f431daa22811fdce9c4ec975d5d33121898b4f9b':
  Fix to NullPointerException on move back in ActivityStack.
This commit is contained in:
Craig Mautner
2013-12-17 08:42:31 -08:00
committed by Android Git Automerger
parent 3fca61f073 f431daa228
commit 422d7003db
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;
if (task == tr && task.mOnTopOfHome || numTasks <= 1) {
if (task != null) {
task.mOnTopOfHome = false;
}
tr.mOnTopOfHome = false;
return mStackSupervisor.resumeHomeActivity(null);
}