Merge "Merge "Fix NPE when calling Session#add" into pi-dev am: 8b7f7f1a am: 7e9b2784"

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;

            InputChannel outInputChannel) {

        return addToDisplay(window, seq, attrs, viewVisibility, Display.DEFAULT_DISPLAY,

                new Rect() /* outFrame */, outContentInsets, outStableInsets, null /* outOutsets */,

                null /* cutout */, outInputChannel);

                new DisplayCutout.ParcelableWrapper()  /* cutout */, outInputChannel);

    }

    @Override

            int viewVisibility, int displayId, Rect outContentInsets, Rect outStableInsets) {

        return mService.addWindow(this, window, seq, attrs, viewVisibility, displayId,

                new Rect() /* outFrame */, outContentInsets, outStableInsets, null /* outOutsets */,

                new ParcelableWrapper() /* cutout */, null /* outInputChannel */);

                new DisplayCutout.ParcelableWrapper() /* cutout */, null /* outInputChannel */);

    }

    @Override