diff options
| author | 2020-11-09 15:24:20 +0000 | |
|---|---|---|
| committer | 2020-11-09 15:24:20 +0000 | |
| commit | 5a448e27ed0e1d41d914f1dd07544a15296b4f15 (patch) | |
| tree | 3ac4cecf812c8a14f9e41ae66ccbdf0740f3e18c /opengl/java | |
| parent | 5401dfbfb25884e17cef1fd18508f1da8200c340 (diff) | |
| parent | eb80316624fd8525dfc5355dac3300489435cde1 (diff) | |
Merge "Add maxTargetSdk restriction to unused APIs." am: f8abe13db4 am: eb80316624
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468245
Change-Id: I60222cb1879651cf283e385519b5c4d156ab68a1
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); |