diff options
| author | Scott Lobdell <slobdell@google.com> | 2020-11-05 18:29:12 -0800 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2020-11-13 11:48:49 -0800 |
| commit | 3933f277a025be704e68ea593536e492831a7e05 (patch) | |
| tree | 084aa5e0858c449a63dd18cc57fb21ab054d363a /opengl/java | |
| parent | 248a6ce2e2ee65f367b01c43edeecef5a6d57581 (diff) | |
| parent | 9c74513b2d828d5169e9942b58b2f93bb3e04aff (diff) | |
Merge SP1A.201105.002
Change-Id: Iec83a0c1f6f286a1e51abfc4356633ca9d8aea5f
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); |