zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup old suppressions from suppressions.xml.

Browse Source 
Limits CpuMonitor to supported Android versions.

Bug: webrtc:6597
Change-Id: I15fb4f5dff2511f578069dd70521728e9909bd15
Reviewed-on: https://webrtc-review.googlesource.com/21225
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20626}
This commit is contained in:
Sami Kalliomäki
2017-11-08 16:02:21 +01:00
committed by Commit Bot
parent 6d85252e9e
commit ec6cf2a94f
4 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sdk/android/src/java/org/webrtc/EglBase14.java
View File

@ -18,6 +18,7 @@ import android.opengl.EGLContext;
import android.opengl.EGLDisplay;
import android.opengl.EGLExt;
import android.opengl.EGLSurface;
import android.os.Build;
import android.view.Surface;
/**
@ -49,10 +50,10 @@ class EglBase14 extends EglBase {
@Override
@SuppressWarnings("deprecation")
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public long getNativeEglContext() {
return CURRENT_SDK_VERSION >= android.os.Build.VERSION_CODES.LOLLIPOP
? egl14Context.getNativeHandle()
: egl14Context.getHandle();
return CURRENT_SDK_VERSION >= Build.VERSION_CODES.LOLLIPOP ? egl14Context.getNativeHandle()
: egl14Context.getHandle();
}
public Context(android.opengl.EGLContext eglContext) {