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

Commit a023ed5f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Write top focused display ID in WindowManagerServiceDumpProto."

parents d08dc911 6164e01e

core/proto/android/server/windowmanagerservice.proto

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ message WindowManagerServiceDumpProto { 
    optional bool display_frozen = 6;

    optional int32 rotation = 7;

    optional int32 last_orientation = 8;

    optional int32 focused_display_id = 9;

}



/* represents RootWindowContainer object */

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

+4 −5
Original line number Diff line number Diff line
@@ -321,12 +321,11 @@ final class InputMonitor { 
    }



    void updateInputWindowsImmediately() {

        if (mUpdateInputWindowsPending) {

        mHandler.removeCallbacks(mUpdateInputWindows);

        mApplyImmediately = true;

        mUpdateInputWindows.run();

        mApplyImmediately = false;

    }

    }



    /* Called when the current input focus changes.

     * Layer assignment is assumed to be complete by the time this is called.

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

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME 
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;

import static com.android.server.wm.WindowManagerServiceDumpProto.DISPLAY_FROZEN;

import static com.android.server.wm.WindowManagerServiceDumpProto.FOCUSED_APP;

import static com.android.server.wm.WindowManagerServiceDumpProto.FOCUSED_DISPLAY_ID;

import static com.android.server.wm.WindowManagerServiceDumpProto.FOCUSED_WINDOW;

import static com.android.server.wm.WindowManagerServiceDumpProto.INPUT_METHOD_WINDOW;

import static com.android.server.wm.WindowManagerServiceDumpProto.LAST_ORIENTATION;
@@ -5930,6 +5931,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        final DisplayContent defaultDisplayContent = getDefaultDisplayContentLocked();

        proto.write(ROTATION, defaultDisplayContent.getRotation());

        proto.write(LAST_ORIENTATION, defaultDisplayContent.getLastOrientation());

        proto.write(FOCUSED_DISPLAY_ID, topFocusedDisplayContent.getDisplayId());

    }



    private void dumpWindowsLocked(PrintWriter pw, boolean dumpAll,