diff options
| author | 2020-11-09 15:09:11 +0000 | |
|---|---|---|
| committer | 2020-11-09 15:09:11 +0000 | |
| commit | eb80316624fd8525dfc5355dac3300489435cde1 (patch) | |
| tree | d25e250c74976bdc07478c0901c41d11ce5e7f6a /opengl/java | |
| parent | 20d93a701c52c15bd0dc7693c13c5917cdba50bc (diff) | |
| parent | f8abe13db481533441caf8749c0d194613230a10 (diff) | |
Merge "Add maxTargetSdk restriction to unused APIs." am: f8abe13db4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468245
Change-Id: I35f65987f7f9287cf03418e9feb27c81f4fd1878
Diffstat (limited to 'opengl/java')
| -rw-r--r-- | opengl/java/android/opengl/EGL14.java | 3 | ||||
| -rw-r--r-- | opengl/java/javax/microedition/khronos/egl/EGL10.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/opengl/java/android/opengl/EGL14.java b/opengl/java/android/opengl/EGL14.java index 90b46fd5901a..80e64e01559a 100644 --- a/opengl/java/android/opengl/EGL14.java +++ b/opengl/java/android/opengl/EGL14.java @@ -20,6 +20,7 @@ package android.opengl; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.SurfaceTexture; +import android.os.Build; import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; @@ -164,7 +165,7 @@ public static final int EGL_CORE_NATIVE_ENGINE = 0x305B; /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static native EGLDisplay eglGetDisplay( long display_id ); diff --git a/opengl/java/javax/microedition/khronos/egl/EGL10.java b/opengl/java/javax/microedition/khronos/egl/EGL10.java index ea571c7311a1..abdbd11828db 100644 --- a/opengl/java/javax/microedition/khronos/egl/EGL10.java +++ b/opengl/java/javax/microedition/khronos/egl/EGL10.java @@ -17,6 +17,7 @@ package javax.microedition.khronos.egl; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; public interface EGL10 extends EGL { int EGL_SUCCESS = 0x3000; @@ -116,7 +117,7 @@ public interface EGL10 extends EGL { String eglQueryString(EGLDisplay display, int name); boolean eglQuerySurface(EGLDisplay display, EGLSurface surface, int attribute, int[] value); /** @hide **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean eglReleaseThread(); boolean eglSwapBuffers(EGLDisplay display, EGLSurface surface); boolean eglTerminate(EGLDisplay display); |