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

Commit 7a67d07d authored by chaviw's avatar chaviw
Browse files

Remove layer from window handle since it's no longer used 

Fixes: 146671630
Test: go/wm-smoke
Change-Id: Ieae773147b1eb7d43fc2688d8570f98075dda8ea
parent 9ec92641

core/java/android/view/InputWindowHandle.java

+0 −4
Original line number Diff line number Diff line
@@ -82,9 +82,6 @@ public final class InputWindowHandle { 
    // Input event dispatching is paused.

    public boolean paused;



    // Window layer.

    public int layer;



    // Id of process and user that owns the window.

    public int ownerPid;

    public int ownerUid;
@@ -126,7 +123,6 @@ public final class InputWindowHandle { 
    @Override

    public String toString() {

        return new StringBuilder(name != null ? name : "")

                .append(", layer=").append(layer)

                .append(", frame=[").append(frameLeft).append(",").append(frameTop).append(",")

                        .append(frameRight).append(",").append(frameBottom).append("]")

                .append(", touchableRegion=").append(touchableRegion)

core/jni/android_hardware_input_InputWindowHandle.cpp

+0 −6
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ static struct { 
    jfieldID hasFocus;

    jfieldID hasWallpaper;

    jfieldID paused;

    jfieldID layer;

    jfieldID ownerPid;

    jfieldID ownerUid;

    jfieldID inputFeatures;
@@ -152,8 +151,6 @@ bool NativeInputWindowHandle::updateInfo() { 
            gInputWindowHandleClassInfo.hasWallpaper);

    mInfo.paused = env->GetBooleanField(obj,

            gInputWindowHandleClassInfo.paused);

    mInfo.layer = env->GetIntField(obj,

            gInputWindowHandleClassInfo.layer);

    mInfo.ownerPid = env->GetIntField(obj,

            gInputWindowHandleClassInfo.ownerPid);

    mInfo.ownerUid = env->GetIntField(obj,
@@ -332,9 +329,6 @@ int register_android_view_InputWindowHandle(JNIEnv* env) { 
    GET_FIELD_ID(gInputWindowHandleClassInfo.paused, clazz,

            "paused", "Z");



    GET_FIELD_ID(gInputWindowHandleClassInfo.layer, clazz,

            "layer", "I");



    GET_FIELD_ID(gInputWindowHandleClassInfo.ownerPid, clazz,

            "ownerPid", "I");

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

+0 −7
Original line number Diff line number Diff line
@@ -276,7 +276,6 @@ class DragState { 
                    display.getDisplayId());

            mDragWindowHandle.name = "drag";

            mDragWindowHandle.token = mServerChannel.getToken();

            mDragWindowHandle.layer = getDragLayerLocked();

            mDragWindowHandle.layoutParamsFlags = 0;

            mDragWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_DRAG;

            mDragWindowHandle.dispatchingTimeoutNanos =
@@ -345,12 +344,6 @@ class DragState { 
        }

    }



    int getDragLayerLocked() {

        return mService.mPolicy.getWindowLayerFromTypeLw(WindowManager.LayoutParams.TYPE_DRAG)

                * WindowManagerService.TYPE_LAYER_MULTIPLIER

                + WindowManagerService.TYPE_LAYER_OFFSET;

    }



    /* call out to each visible window/session informing it about the drag

     */

    void broadcastDragStartedLocked(final float touchX, final float touchY) {

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

+0 −7
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ class InputConsumerImpl implements IBinder.DeathRecipient { 
        mWindowHandle.name = name;

        mWindowHandle.token = mServerChannel.getToken();

        mWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_INPUT_CONSUMER;

        mWindowHandle.layer = getLayerLw(mWindowHandle.layoutParamsType);

        mWindowHandle.layoutParamsFlags = 0;

        mWindowHandle.dispatchingTimeoutNanos =

                WindowManagerService.DEFAULT_INPUT_DISPATCHING_TIMEOUT_NANOS;
@@ -150,12 +149,6 @@ class InputConsumerImpl implements IBinder.DeathRecipient { 
        t.setLayer(mInputSurface, layer);

    }



    private int getLayerLw(int windowType) {

        return mService.mPolicy.getWindowLayerFromTypeLw(windowType)

                * WindowManagerService.TYPE_LAYER_MULTIPLIER

                + WindowManagerService.TYPE_LAYER_OFFSET;

    }



    void disposeChannelsLw() {

        mService.mInputManager.unregisterInputChannel(mServerChannel);

        mClientChannel.dispose();

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

+1 −3
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ final class InputMonitor { 
        inputWindowHandle.hasFocus = hasFocus;

        inputWindowHandle.hasWallpaper = hasWallpaper;

        inputWindowHandle.paused = child.mActivityRecord != null ? child.mActivityRecord.paused : false;

        inputWindowHandle.layer = child.mLayer;

        inputWindowHandle.ownerPid = child.mSession.mPid;

        inputWindowHandle.ownerUid = child.mSession.mUid;

        inputWindowHandle.inputFeatures = child.mAttrs.inputFeatures;
@@ -499,8 +498,7 @@ final class InputMonitor { 
                }

            }



            if (mAddInputConsumerHandle

                    && inputWindowHandle.layer <= navInputConsumer.mWindowHandle.layer) {

            if (mAddInputConsumerHandle) {

                navInputConsumer.show(mInputTransaction, w);

                mAddInputConsumerHandle = false;

            }