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

Merge "More debugging for bug 17721767" into lmp-mr1-dev

Browse Source
This commit is contained in:
Craig Mautner
2015-01-20 22:57:41 +00:00
committed by Android (Google) Code Review
parent 77c96dd80a 94ab46659b
commit 088bf3a37a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -1478,7 +1478,7 @@ final class ActivityStack {
cancelInitializingActivities(); cancelInitializingActivities();
// Find the first activity that is not finishing. // Find the first activity that is not finishing.
ActivityRecord next = topRunningActivityLocked(null); final ActivityRecord next = topRunningActivityLocked(null);
// Remember how we'll process this pause/resume situation, and ensure // Remember how we'll process this pause/resume situation, and ensure
// that the state is reset however we wind up proceeding. // that the state is reset however we wind up proceeding.
@@ -1819,7 +1819,9 @@ final class ActivityStack {
EventLog.writeEvent(EventLogTags.AM_RESUME_ACTIVITY, EventLog.writeEvent(EventLogTags.AM_RESUME_ACTIVITY,
next.userId, System.identityHashCode(next), next.userId, System.identityHashCode(next),
next.task.taskId, next.shortComponentName); next.task.taskId, next.shortComponentName + " top="
+ mStacks.get(mStacks.size() - 1).mStackId + " Callers="
+ Debug.getCallers(6));
next.sleeping = false; next.sleeping = false;
mService.showAskCompatModeDialogLocked(next); mService.showAskCompatModeDialogLocked(next);