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

Commit 8501866d authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Still more debugging for bug 19823482"

parents ebf750bc 7258118c

services/core/java/com/android/server/am/ActivityStack.java

+2 −3
Original line number Diff line number Diff line
@@ -3919,9 +3919,8 @@ final class ActivityStack { 
        mStackSupervisor.removeChildActivityContainers(r);



        try {

            if (DEBUG_SWITCH || DEBUG_STATES) Slog.i(TAG,

                    (andResume ? "Relaunching to RESUMED " : "Relaunching to PAUSED ")

                    + r);

            if (DEBUG_SWITCH || DEBUG_STATES) Slog.i(TAG, "Moving to " +

                    (andResume ? "RESUMED" : "PAUSED") + " Relaunching " + r);

            r.forceNewConfig = false;

            r.app.thread.scheduleRelaunchActivity(r.appToken, results, newIntents, changes,

                    !andResume, new Configuration(mService.mConfiguration),

services/core/java/com/android/server/wm/WindowManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -4608,8 +4608,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            if (DEBUG_APP_TRANSITIONS || DEBUG_ORIENTATION) Slog.v(TAG, "setAppVisibility(" +

                    token + ", visible=" + visible + "): " + mAppTransition +

                    " hidden=" + wtoken.hidden + " hiddenRequested=" +

                    wtoken.hiddenRequested, HIDE_STACK_CRAWLS ?

                            null : new RuntimeException("here").fillInStackTrace());

                    wtoken.hiddenRequested + " Callers=" + Debug.getCallers(6));



            // If we are preparing an app transition, then delay changing

            // the visibility of this token until we execute that transition.