From 94ab46659bac1ffdfd7b72d15a68ea6d3b09224e Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Tue, 20 Jan 2015 10:49:22 -0800 Subject: [PATCH] More debugging for bug 17721767 Narrow down why GEL is being resumed instead of the top stack. Change-Id: I79c0be4adf0ccee30e1a5aa4308ee91148f239fa --- services/core/java/com/android/server/am/ActivityStack.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 3f4749af5a59a..c3a344f5d7f60 100755 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -1478,7 +1478,7 @@ final class ActivityStack { cancelInitializingActivities(); // 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 // that the state is reset however we wind up proceeding. @@ -1819,7 +1819,9 @@ final class ActivityStack { EventLog.writeEvent(EventLogTags.AM_RESUME_ACTIVITY, 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; mService.showAskCompatModeDialogLocked(next);