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

Commit e571433a authored by Craig Mautner's avatar Craig Mautner
Browse files

Debug for bug 19823482.

And a skosh of refactoring.

Change-Id: Id80046bb16b8da4bff5a74ae87004c078d57e67b
parent 1cef4196
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -1112,7 +1112,7 @@ final class ActivityStack {
        }
    }

    private void setVisibile(ActivityRecord r, boolean visible) {
    private void setVisible(ActivityRecord r, boolean visible) {
        r.visible = visible;
        mWindowManager.setAppVisibility(r.appToken, visible);
        final ArrayList<ActivityContainer> containers = r.mChildContainers;
@@ -1297,7 +1297,7 @@ final class ActivityStack {
                        if (!r.visible || r.mLaunchTaskBehind) {
                            if (DEBUG_VISBILITY) Slog.v(
                                    TAG, "Starting and making visible: " + r);
                            setVisibile(r, true);
                            setVisible(r, true);
                        }
                        if (r != starting) {
                            mStackSupervisor.startSpecificActivityLocked(r, false, false);
@@ -1329,7 +1329,7 @@ final class ActivityStack {
                                    r.updateOptionsLocked(r.returningOptions);
                                    mUndrawnActivitiesBelowTopTranslucent.add(r);
                                }
                                setVisibile(r, true);
                                setVisible(r, true);
                                r.sleeping = false;
                                r.app.pendingUiClean = true;
                                r.app.thread.scheduleWindowVisibility(r.appToken, true);
@@ -1364,7 +1364,7 @@ final class ActivityStack {
                    if (r.visible) {
                        if (DEBUG_VISBILITY) Slog.v(TAG, "Making invisible: " + r);
                        try {
                            setVisibile(r, false);
                            setVisible(r, false);
                            switch (r.state) {
                                case STOPPING:
                                case STOPPED:
+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
    static final boolean DEBUG_RELEASE = DEBUG || false;
    static final boolean DEBUG_SAVED_STATE = DEBUG || false;
    static final boolean DEBUG_SCREENSHOTS = DEBUG || false;
    static final boolean DEBUG_STATES = DEBUG || false;
    static final boolean DEBUG_STATES = DEBUG || true;
    static final boolean DEBUG_VISIBLE_BEHIND = DEBUG || false;

    public static final int HOME_STACK_ID = 0;
+3 −5
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ public class WindowManagerService extends IWindowManager.Stub
    static final boolean DEBUG_ORIENTATION = false;
    static final boolean DEBUG_APP_ORIENTATION = false;
    static final boolean DEBUG_CONFIGURATION = false;
    static final boolean DEBUG_APP_TRANSITIONS = false;
    static final boolean DEBUG_APP_TRANSITIONS = true;
    static final boolean DEBUG_STARTING_WINDOW = false;
    static final boolean DEBUG_WALLPAPER = false;
    static final boolean DEBUG_WALLPAPER_LIGHT = false || DEBUG_WALLPAPER;
@@ -189,7 +189,7 @@ public class WindowManagerService extends IWindowManager.Stub
    static final boolean DEBUG_LAYOUT_REPEATS = true;
    static final boolean DEBUG_SURFACE_TRACE = false;
    static final boolean DEBUG_WINDOW_TRACE = false;
    static final boolean DEBUG_TASK_MOVEMENT = false;
    static final boolean DEBUG_TASK_MOVEMENT = true;
    static final boolean DEBUG_STACK = false;
    static final boolean DEBUG_DISPLAY = false;
    static final boolean DEBUG_POWER = false;
@@ -3716,10 +3716,8 @@ public class WindowManagerService extends IWindowManager.Stub
        } else {
            // TODO(multidisplay): Change to the correct display.
            final WindowList windows = getDefaultWindowListLocked();
            int pos = windows.size() - 1;
            while (pos >= 0) {
            for (int pos = windows.size() - 1; pos >= 0; --pos) {
                WindowState win = windows.get(pos);
                pos--;
                if (win.mAppToken != null) {
                    // We hit an application window. so the orientation will be determined by the
                    // app window. No point in continuing further.