commit cb3af8280cc28919966c7f1b913f64892c9770aa
author Evan Rosky <erosky@google.com> Tue Feb 05 18:00:23 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 05 18:00:23 2019 +0000
tree a4edc31ce427b126a55f9891495ca9d5039607fa
parent 1722c403504d70896232769c51d26e55d99c3296
parent 65dffa6339ecfb93f7c4fd1eb09a9a7fc6571560

Merge "Remove TestApi use from WindowContainer"

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

diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index ed5f5a8..b246da4 100644
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -32,7 +32,6 @@
 import android.annotation.CallSuper;
 import android.annotation.IntDef;
 import android.annotation.Nullable;
-import android.annotation.TestApi;
 import android.app.WindowConfiguration;
 import android.content.res.Configuration;
 import android.graphics.Point;
@@ -46,6 +45,7 @@
 import android.view.SurfaceControl.Builder;
 import android.view.SurfaceSession;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.ToBooleanFunction;
 import com.android.server.wm.SurfaceAnimator.Animatable;
 
@@ -1332,7 +1332,7 @@
         mLastSurfacePosition.set(mTmpPos.x, mTmpPos.y);
     }
 
-    @TestApi
+    @VisibleForTesting
     Point getLastSurfacePosition() {
         return mLastSurfacePosition;
     }