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

Commit cb3af828 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Remove TestApi use from WindowContainer"

parents 1722c403 65dffa63

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -32,7 +32,6 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; 
import android.annotation.CallSuper;

import android.annotation.CallSuper;

import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.app.WindowConfiguration;

import android.app.WindowConfiguration;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.graphics.Point;

import android.graphics.Point;
@@ -46,6 +45,7 @@ import android.view.SurfaceControl; 
import android.view.SurfaceControl.Builder;

import android.view.SurfaceControl.Builder;

import android.view.SurfaceSession;

import android.view.SurfaceSession;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ToBooleanFunction;

import com.android.internal.util.ToBooleanFunction;

import com.android.server.wm.SurfaceAnimator.Animatable;

import com.android.server.wm.SurfaceAnimator.Animatable;
@@ -1332,7 +1332,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        mLastSurfacePosition.set(mTmpPos.x, mTmpPos.y);

        mLastSurfacePosition.set(mTmpPos.x, mTmpPos.y);

    }

    }





    @TestApi

    @VisibleForTesting

    Point getLastSurfacePosition() {

    Point getLastSurfacePosition() {

        return mLastSurfacePosition;

        return mLastSurfacePosition;

    }

    }