From 9a5c3105dd241e014d4601b00786897f7c5d1d8d Mon Sep 17 00:00:00 2001 From: Artur Satayev Date: Thu, 23 Jan 2020 16:49:36 +0000 Subject: Replace dalvik..UnsupportedAppUsage annotation. The new annotation to be used is android.compat.annotation.UnsupportedAppUsage. Test: m Bug: 145132366 Change-Id: Ib2101605fb385b4f778893e5181a954dccbea037 Exempt-From-Owner-Approval: roll-forward previously approved change --- opengl/java/com/google/android/gles_jni/EGLImpl.java | 3 +-- opengl/java/com/google/android/gles_jni/GLImpl.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'opengl') diff --git a/opengl/java/com/google/android/gles_jni/EGLImpl.java b/opengl/java/com/google/android/gles_jni/EGLImpl.java index f94f69f0fd3f..b4ea0a6132a5 100644 --- a/opengl/java/com/google/android/gles_jni/EGLImpl.java +++ b/opengl/java/com/google/android/gles_jni/EGLImpl.java @@ -16,13 +16,12 @@ 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 2a8d07f03148..3c808a6ada48 100644 --- a/opengl/java/com/google/android/gles_jni/GLImpl.java +++ b/opengl/java/com/google/android/gles_jni/GLImpl.java @@ -20,14 +20,13 @@ 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; -- cgit v1.2.3