summaryrefslogtreecommitdiff
path: root/opengl/java/android
diff options
context:
space:
mode:
authorArtur Satayev <satayev@google.com>2019-12-10 17:47:56 +0000
committerArtur Satayev <satayev@google.com>2020-01-14 15:54:55 +0000
commit53ada2ab282c1b6b72365bc1c6b7aaa29e170eca (patch)
treea8f06d1c30503a7f1b35722ce756485fd94ea3b2 /opengl/java/android
parent3516f5853a3a53be03e5ab331e9bbef34d16eb84 (diff)
Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library. Bug: 145132366 Test: m && diff unsupportedappusage_index.csv \ git diff HEAD^ HEAD | grep '^[+-][^+-]' | grep -v '.import' Merged-In: I853372f3c6fef905553bb31be4f1bb48df735f7a Change-Id: I853372f3c6fef905553bb31be4f1bb48df735f7a
Diffstat (limited to 'opengl/java/android')
-rw-r--r--opengl/java/android/opengl/EGL14.java4
-rw-r--r--opengl/java/android/opengl/GLES20.java2
-rw-r--r--opengl/java/android/opengl/GLSurfaceView.java2
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;