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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-12 01:57:20 +00:00
committed by Android (Google) Code Review
parent dcec75aa05 4ab9e828b1
commit 8b7f7f1aa5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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