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

Commit d618e1db authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused API on IWindowSession, prepare for multi-display."

parents 44e8c4ff 70f6ae76

core/java/android/view/IWindowSession.aidl

+0 −5
Original line number Diff line number Diff line
@@ -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);

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

+0 −16
Original line number Diff line number Diff line
@@ -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) {