Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: ce5e4ed111

Change-Id: I8a5e94996f16a171df28d7a226bbd57bf62d8936
This commit is contained in:
Daichi Hirono
2018-04-10 19:33:42 -07:00
committed by android-build-merger
parent 24e7aa812f ce5e4ed111
commit 29804c8c22
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/Session.java
View File

@@ -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