From 65b44e7855acafaa527e65755f6340a36209c641 Mon Sep 17 00:00:00 2001
From: Daichi Hirono <hirono@google.com>
Date: Fri, 6 Apr 2018 09:31:02 +0900
Subject: [PATCH] Fix NPE when calling Session#addToDisplayWithoutInputChannel

Bug: 77658328
Test: None
Change-Id: I633c5a32fc969987bd5302753a83bd5253876e2d
---
 services/core/java/com/android/server/wm/Session.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java
index 662d51d6e0e56..d71f67f7c0a9c 100644
--- a/services/core/java/com/android/server/wm/Session.java
+++ b/services/core/java/com/android/server/wm/Session.java
@@ -45,6 +45,7 @@ import android.util.MergedConfiguration;
 import android.util.Slog;
 import android.view.Display;
 import android.view.DisplayCutout;
+import android.view.DisplayCutout.ParcelableWrapper;
 import android.view.IWindow;
 import android.view.IWindowId;
 import android.view.IWindowSession;
@@ -218,7 +219,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient {
             int viewVisibility, int displayId, Rect outContentInsets, Rect outStableInsets) {
         return mService.addWindow(this, window, seq, attrs, viewVisibility, displayId,
                 new Rect() /* outFrame */, outContentInsets, outStableInsets, null /* outOutsets */,
-                null /* cutout */, null /* outInputChannel */);
+                new ParcelableWrapper() /* cutout */, null /* outInputChannel */);
     }
 
     @Override