From a63a2c0130f6adfa6c0bf112021bc61f569d8105 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Thu, 19 Dec 2019 06:38:19 +0000 Subject: Revert "Use new UnsupportedAppUsage annotation." This reverts commit a5264903e22bc741add895133474ea13a370de4c. Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=sdk_phone_armv7-sdk&lkgb=6083299&lkbb=6085371&fkbb=6083313, bug b/146533269 Change-Id: Ie5b031d7b277cf0e09b0a9776b26bf74f5f69e70 --- opengl/java/android/opengl/EGL14.java | 4 ++-- opengl/java/android/opengl/GLES20.java | 2 +- opengl/java/android/opengl/GLSurfaceView.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'opengl/java/android') diff --git a/opengl/java/android/opengl/EGL14.java b/opengl/java/android/opengl/EGL14.java index 90b46fd5901a..728e6e18cc31 100644 --- a/opengl/java/android/opengl/EGL14.java +++ b/opengl/java/android/opengl/EGL14.java @@ -18,11 +18,11 @@ package android.opengl; -import android.compat.annotation.UnsupportedAppUsage; +import android.annotation.UnsupportedAppUsage; import android.graphics.SurfaceTexture; import android.view.Surface; -import android.view.SurfaceHolder; import android.view.SurfaceView; +import android.view.SurfaceHolder; /** * EGL 1.4 diff --git a/opengl/java/android/opengl/GLES20.java b/opengl/java/android/opengl/GLES20.java index e853e4447daa..d66e7ac84a3b 100644 --- a/opengl/java/android/opengl/GLES20.java +++ b/opengl/java/android/opengl/GLES20.java @@ -19,7 +19,7 @@ package android.opengl; -import android.compat.annotation.UnsupportedAppUsage; +import android.annotation.UnsupportedAppUsage; /** OpenGL ES 2.0 */ diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index 75131b0f6b9c..8a3e6a0b0fd5 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -16,7 +16,7 @@ package android.opengl; -import android.compat.annotation.UnsupportedAppUsage; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Trace; import android.util.AttributeSet; -- cgit v1.2.3