diff options
| author | satayev <satayev@google.com> | 2019-12-18 08:05:21 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-18 08:05:21 -0800 |
| commit | 068a9faf3df085468c301443ed5c5d7e828c58ab (patch) | |
| tree | 54dd1886d3dcc455a92a3f0d6dca0a50600a8768 /opengl/java/android | |
| parent | 54c4b58fa1cde6e7402b3e740742da98b8f74697 (diff) | |
| parent | 1385dca8f6f8e582d867c817432447286df54e2e (diff) | |
Merge "Use new UnsupportedAppUsage annotation."
am: 1385dca8f6
Change-Id: I50c9bd452147a28fd2cb76f1d9fe91336b7104c1
Diffstat (limited to 'opengl/java/android')
| -rw-r--r-- | opengl/java/android/opengl/EGL14.java | 4 | ||||
| -rw-r--r-- | opengl/java/android/opengl/GLES20.java | 2 | ||||
| -rw-r--r-- | opengl/java/android/opengl/GLSurfaceView.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/opengl/java/android/opengl/EGL14.java b/opengl/java/android/opengl/EGL14.java index 728e6e18cc31..90b46fd5901a 100644 --- a/opengl/java/android/opengl/EGL14.java +++ b/opengl/java/android/opengl/EGL14.java @@ -18,11 +18,11 @@ package android.opengl; -import android.annotation.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import android.graphics.SurfaceTexture; import android.view.Surface; -import android.view.SurfaceView; import android.view.SurfaceHolder; +import android.view.SurfaceView; /** * EGL 1.4 diff --git a/opengl/java/android/opengl/GLES20.java b/opengl/java/android/opengl/GLES20.java index d66e7ac84a3b..e853e4447daa 100644 --- a/opengl/java/android/opengl/GLES20.java +++ b/opengl/java/android/opengl/GLES20.java @@ -19,7 +19,7 @@ package android.opengl; -import android.annotation.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; /** OpenGL ES 2.0 */ diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index 8a3e6a0b0fd5..75131b0f6b9c 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -16,7 +16,7 @@ package android.opengl; -import android.annotation.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Trace; import android.util.AttributeSet; |