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

Commit 29804c8c authored by Daichi Hirono's avatar Daichi Hirono Committed by android-build-merger
Browse files

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

am: ce5e4ed1

Change-Id: I8a5e94996f16a171df28d7a226bbd57bf62d8936
parents 24e7aa81 ce5e4ed1

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

+2 −1
Original line number Diff line number Diff line
@@ -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