diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl index f868a00f03593..bedfa9ff133ce 100644 --- a/core/java/android/view/IWindowSession.aidl +++ b/core/java/android/view/IWindowSession.aidl @@ -37,15 +37,10 @@ import android.view.SurfaceControl; * {@hide} */ interface IWindowSession { - int add(IWindow window, int seq, in WindowManager.LayoutParams attrs, - in int viewVisibility, out Rect outContentInsets, out Rect outStableInsets, - out InputChannel outInputChannel); int addToDisplay(IWindow window, int seq, in WindowManager.LayoutParams attrs, in int viewVisibility, in int layerStackId, out Rect outFrame, out Rect outContentInsets, out Rect outStableInsets, out Rect outOutsets, out DisplayCutout.ParcelableWrapper displayCutout, out InputChannel outInputChannel); - int addWithoutInputChannel(IWindow window, int seq, in WindowManager.LayoutParams attrs, - in int viewVisibility, out Rect outContentInsets, out Rect outStableInsets); int addToDisplayWithoutInputChannel(IWindow window, int seq, in WindowManager.LayoutParams attrs, in int viewVisibility, in int layerStackId, out Rect outContentInsets, out Rect outStableInsets); diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java index 4003d5a1fe024..26ddf2c4be814 100644 --- a/services/core/java/com/android/server/wm/Session.java +++ b/services/core/java/com/android/server/wm/Session.java @@ -188,15 +188,6 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { } } - @Override - public int add(IWindow window, int seq, WindowManager.LayoutParams attrs, - int viewVisibility, Rect outContentInsets, Rect outStableInsets, - InputChannel outInputChannel) { - return addToDisplay(window, seq, attrs, viewVisibility, Display.DEFAULT_DISPLAY, - new Rect() /* outFrame */, outContentInsets, outStableInsets, null /* outOutsets */, - new DisplayCutout.ParcelableWrapper() /* cutout */, outInputChannel); - } - @Override public int addToDisplay(IWindow window, int seq, WindowManager.LayoutParams attrs, int viewVisibility, int displayId, Rect outFrame, Rect outContentInsets, @@ -206,13 +197,6 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { outContentInsets, outStableInsets, outOutsets, outDisplayCutout, outInputChannel); } - @Override - public int addWithoutInputChannel(IWindow window, int seq, WindowManager.LayoutParams attrs, - int viewVisibility, Rect outContentInsets, Rect outStableInsets) { - return addToDisplayWithoutInputChannel(window, seq, attrs, viewVisibility, - Display.DEFAULT_DISPLAY, outContentInsets, outStableInsets); - } - @Override public int addToDisplayWithoutInputChannel(IWindow window, int seq, WindowManager.LayoutParams attrs, int viewVisibility, int displayId, Rect outContentInsets, Rect outStableInsets) {