Merge "Correct displayId info in log when WMS#addWindow returned ADD_INVALID_DISPLAY"

2020-09-02 11:12:51 +00:00
parent 37224d7191 310125a2f9
commit 6ca9a6fda3
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -1410,7 +1410,8 @@ public class WindowManagerService extends IWindowManager.Stub
            if (!displayContent.hasAccess(session.mUid)) {
                ProtoLog.w(WM_ERROR,
                        "Attempted to add window to a display for which the application "
-                                + "does not have access: %d.  Aborting.", displayId);
+                                + "does not have access: %d.  Aborting.",
+                        displayContent.getDisplayId());
                return WindowManagerGlobal.ADD_INVALID_DISPLAY;
            }