Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d93597ce authored by Craig Mautner's avatar Craig Mautner Committed by android-build-merger
Browse files

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

automerge: 1388342c

* commit '1388342c':
  More debugging for bug 17721767
parents ebdec3e0 1388342c
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -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);