diff options
| author | Austin Wang <wangaustin@google.com> | 2019-12-19 06:38:19 +0000 |
|---|---|---|
| committer | Austin Wang <wangaustin@google.com> | 2019-12-19 06:38:19 +0000 |
| commit | a63a2c0130f6adfa6c0bf112021bc61f569d8105 (patch) | |
| tree | e3c9d96127eb12f39eb8845b1e7d0675fa565d45 /opengl/java/com/google/android | |
| parent | a5264903e22bc741add895133474ea13a370de4c (diff) | |
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
Diffstat (limited to 'opengl/java/com/google/android')
| -rw-r--r-- | opengl/java/com/google/android/gles_jni/EGLImpl.java | 3 | ||||
| -rw-r--r-- | opengl/java/com/google/android/gles_jni/GLImpl.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/opengl/java/com/google/android/gles_jni/EGLImpl.java b/opengl/java/com/google/android/gles_jni/EGLImpl.java index b4ea0a6132a5..f94f69f0fd3f 100644 --- a/opengl/java/com/google/android/gles_jni/EGLImpl.java +++ b/opengl/java/com/google/android/gles_jni/EGLImpl.java @@ -16,12 +16,13 @@ package com.google.android.gles_jni; -import android.compat.annotation.UnsupportedAppUsage; import android.graphics.SurfaceTexture; import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; +import dalvik.annotation.compat.UnsupportedAppUsage; + import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.egl.EGLContext; diff --git a/opengl/java/com/google/android/gles_jni/GLImpl.java b/opengl/java/com/google/android/gles_jni/GLImpl.java index 3c808a6ada48..2a8d07f03148 100644 --- a/opengl/java/com/google/android/gles_jni/GLImpl.java +++ b/opengl/java/com/google/android/gles_jni/GLImpl.java @@ -20,13 +20,14 @@ package com.google.android.gles_jni; import android.app.AppGlobals; -import android.compat.annotation.UnsupportedAppUsage; import android.content.pm.ApplicationInfo; import android.content.pm.IPackageManager; import android.os.Build; import android.os.UserHandle; import android.util.Log; +import dalvik.annotation.compat.UnsupportedAppUsage; + import java.nio.Buffer; import javax.microedition.khronos.opengles.GL10; |