commit a0d3d3200010371f371da4ec18f7d0d814f646ee
author Craig Mautner <cmautner@google.com> Tue Jan 20 10:49:22 2015 -0800
committer The Android Automerger <android-build@google.com> Tue Jan 20 15:31:44 2015 -0800
tree ee6d63f280dce9f5374e3a66d635868923c682b9
parent a0dd797363acafb75af1a1dd6a0e1c34e7b82ef9

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

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 3f4749a..c3a344f 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 @@
         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 @@
 
                 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);