Index: webrtc/api/java/android/org/webrtc/EglBase14.java |
diff --git a/webrtc/api/java/android/org/webrtc/EglBase14.java b/webrtc/api/java/android/org/webrtc/EglBase14.java |
index 5b377e0bad1a073800f7f2c9dc25d304004868a9..f23ca949e468a02927bbc717b6f21bd82e7334af 100644 |
--- a/webrtc/api/java/android/org/webrtc/EglBase14.java |
+++ b/webrtc/api/java/android/org/webrtc/EglBase14.java |
@@ -38,13 +38,10 @@ |
// EGL 1.4 is supported from API 17. But EGLExt that is used for setting presentation |
// time stamp on a surface is supported from 18 so we require 18. |
- // Currently EGL 1.4 support is disabled for all devices, since it causes deadlock |
- // in Android view rendering on some devices. |
- // TODO(magjed,glaznev) - investigate if it can be re-enabled back. |
public static boolean isEGL14Supported() { |
- Logging.d(TAG, "SDK version: " + CURRENT_SDK_VERSION + |
- ". isEGL14Supported: forced to false."); |
- return false; |
+ Logging.d(TAG, "SDK version: " + CURRENT_SDK_VERSION |
+ + ". isEGL14Supported: " + (CURRENT_SDK_VERSION >= EGLExt_SDK_VERSION)); |
+ return (CURRENT_SDK_VERSION >= EGLExt_SDK_VERSION); |
} |
public static class Context extends EglBase.Context { |