am 1388342c: am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev

* commit '1388342c7f6e9c235d31b01edf3716e83fad3e64': More debugging for bug 17721767
2015-01-20 23:58:00 +00:00
parent ebdec3e092 1388342c7f
commit 07d2f0cff4
1 changed files with 4 additions and 2 deletions
--- 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.
@@ -1820,7 +1820,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);