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

Commit e45f1e5f authored by Tiger Huang's avatar Tiger Huang
Browse files

Remove forwarded insets 

It was only used by ActivityView to forward IME insets, but ActivityView
is gone now. We should clean it up.

Bug: 161810301
Test: presubmit
Change-Id: Ib173112f2d668b0bb93ee2b5e639d236686846c1
parent d320bc3a

core/java/android/view/IWindowManager.aidl

+0 −11
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.content.res.CompatibilityInfo; 
import android.content.res.Configuration;

import android.graphics.Bitmap;

import android.graphics.GraphicBuffer;

import android.graphics.Insets;

import android.graphics.Point;

import android.graphics.Rect;

import android.graphics.Region;
@@ -484,16 +483,6 @@ interface IWindowManager 
    @UnsupportedAppUsage

    void getStableInsets(int displayId, out Rect outInsets);



    /**

     * Set the forwarded insets on the display.

     * <p>

     * This is only used in case a virtual display is displayed on another display that has insets,

     * and the bounds of the virtual display is overlapping with the insets from the host display.

     * In that case, the contents on the virtual display won't be placed over the forwarded insets.

     * Only the owner of the display is permitted to set the forwarded insets on it.

     */

    void setForwardedInsets(int displayId, in Insets insets);



    /**

     * Register shortcut key. Shortcut code is packed as:

     * (MetaState << Integer.SIZE) | KeyCode

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

+0 −15
Original line number Diff line number Diff line
@@ -5520,21 +5520,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        return keepClearAreas;

    }



    /**

     * @see IWindowManager#setForwardedInsets

     */

    public void setForwardedInsets(Insets insets) {

        if (insets == null) {

            insets = Insets.NONE;

        }

        if (mDisplayPolicy.getForwardedInsets().equals(insets)) {

            return;

        }

        mDisplayPolicy.setForwardedInsets(insets);

        setLayoutNeeded();

        mWmService.mWindowPlacerLocked.requestTraversal();

    }



    protected MetricsLogger getMetricsLogger() {

        if (mMetricsLogger == null) {

            mMetricsLogger = new MetricsLogger();

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

+0 −22
Original line number Diff line number Diff line
@@ -359,16 +359,6 @@ public class DisplayPolicy { 


    private int mDisplayCutoutTouchableRegionSize;



    /**

     * The area covered by system windows which belong to another display. Forwarded insets is set

     * in case this is a virtual display, this is displayed on another display that has insets, and

     * the bounds of this display is overlapping with the insets of the host display (e.g. IME is

     * displayed on the host display, and it covers a part of this virtual display.)

     * The forwarded insets is used to compute display frames of this virtual display, which will

     * be then used to layout windows in the virtual display.

     */

    @NonNull private Insets mForwardedInsets = Insets.NONE;



    private RefreshRatePolicy mRefreshRatePolicy;



    /**
@@ -2149,18 +2139,6 @@ public class DisplayPolicy { 
        }

    }



    /**

     * @see IWindowManager#setForwardedInsets

     */

    public void setForwardedInsets(@NonNull Insets forwardedInsets) {

        mForwardedInsets = forwardedInsets;

    }



    @NonNull

    public Insets getForwardedInsets() {

        return mForwardedInsets;

    }



    @NavigationBarPosition

    int navigationBarPosition(int displayRotation) {

        if (mNavigationBar != null) {

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

+0 −18
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ import android.content.res.Resources; 
import android.content.res.TypedArray;

import android.database.ContentObserver;

import android.graphics.Bitmap;

import android.graphics.Insets;

import android.graphics.Point;

import android.graphics.PointF;

import android.graphics.Rect;
@@ -6961,23 +6960,6 @@ public class WindowManagerService extends IWindowManager.Stub 
        }

    }



    @Override

    public void setForwardedInsets(int displayId, Insets insets) throws RemoteException {

        synchronized (mGlobalLock) {

            final DisplayContent dc = mRoot.getDisplayContent(displayId);

            if (dc == null) {

                return;

            }

            final int callingUid = Binder.getCallingUid();

            final int displayOwnerUid = dc.getDisplay().getOwnerUid();

            if (callingUid != displayOwnerUid) {

                throw new SecurityException(

                        "Only owner of the display can set ForwardedInsets to it.");

            }

            dc.setForwardedInsets(insets);

        }

    }



    MousePositionTracker mMousePositionTracker = new MousePositionTracker();



    private static class MousePositionTracker implements PointerEventListener {