diff options
| author | Steven Laver <lavers@google.com> | 2020-01-23 17:03:21 -0800 |
|---|---|---|
| committer | Steven Laver <lavers@google.com> | 2020-02-04 23:22:55 +0000 |
| commit | 71998c3d8b36220df1be12fe6e1ba7eda81cde41 (patch) | |
| tree | 8b5e07fadfa5561f430abd298094046a496c3fb3 /opengl/java | |
| parent | 4307c64762e7fd78e8cdd955296655d51a6094e2 (diff) | |
| parent | db0ac39741da692dddac3ff31aa87634af92e1e8 (diff) | |
Merge RP1A.200123.001
Change-Id: I16a4437d9876db7a6a2b07231b4584df4564bee4
Diffstat (limited to 'opengl/java')
| -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 | ||||
| -rw-r--r-- | opengl/java/javax/microedition/khronos/egl/EGL10.java | 3 |
4 files changed, 5 insertions, 6 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 cc67f55ed087..f2de887ba7b1 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; diff --git a/opengl/java/javax/microedition/khronos/egl/EGL10.java b/opengl/java/javax/microedition/khronos/egl/EGL10.java index 8a2517062d4d..ea571c7311a1 100644 --- a/opengl/java/javax/microedition/khronos/egl/EGL10.java +++ b/opengl/java/javax/microedition/khronos/egl/EGL10.java @@ -16,8 +16,7 @@ package javax.microedition.khronos.egl; -import android.annotation.UnsupportedAppUsage; -import java.lang.String; +import android.compat.annotation.UnsupportedAppUsage; public interface EGL10 extends EGL { int EGL_SUCCESS = 0x3000; |