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

Commit 7e9b2784 authored by Daichi Hirono's avatar Daichi Hirono Committed by android-build-merger
Browse files

Merge "Fix NPE when calling Session#add" into pi-dev

am: 8b7f7f1a

Change-Id: Ibe98f60804d9e4945b11871f5bd5a817f800cd07
parents 0a9950cb 8b7f7f1a
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 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;
@@ -195,7 +194,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient {
            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
@@ -219,7 +218,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 */,
                new ParcelableWrapper() /* cutout */, null /* outInputChannel */);
                new DisplayCutout.ParcelableWrapper() /* cutout */, null /* outInputChannel */);
    }

    @Override