From ab1e4df11aefe71c8069730ad5a9300733440f25 Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 4 Sep 2017 05:32:54 -0700 Subject: [PATCH] Update moe eqiuvalence ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=167488837 --- .../android/exoplayer2/video/DummySurface.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java b/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java index 8551f2541d..a1820ed7a1 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java @@ -43,7 +43,6 @@ import static android.opengl.GLES20.glGenTextures; import android.annotation.TargetApi; import android.content.Context; -import android.content.pm.PackageManager; import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture.OnFrameAvailableListener; import android.opengl.EGL14; @@ -153,16 +152,9 @@ public final class DummySurface extends Surface { * * @param context Any {@link Context}. */ - @SuppressWarnings("unused") + @SuppressWarnings("unused") // Context may be needed in the future for better targeting. private static boolean deviceNeedsSecureDummySurfaceWorkaround(Context context) { - return (Util.SDK_INT == 24 && "samsung".equals(Util.MANUFACTURER)) - || (Util.SDK_INT >= 24 && Util.SDK_INT < 26 - && !hasVrModeHighPerformanceSystemFeatureV24(context.getPackageManager())); - } - - @TargetApi(24) - private static boolean hasVrModeHighPerformanceSystemFeatureV24(PackageManager packageManager) { - return packageManager.hasSystemFeature(PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE); + return Util.SDK_INT == 24 && "samsung".equals(Util.MANUFACTURER); } private static class DummySurfaceThread extends HandlerThread implements OnFrameAvailableListener,