From b9ead4b7d1a89b6cbcdcf9d50688e9f9e6d1c6fe Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 11 Aug 2017 15:47:03 +0100
Subject: [PATCH] Restrict usage of secure DummySurface for all Samsung
 devices.

---
 .../java/com/google/android/exoplayer2/video/DummySurface.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e32f23fed7..7a80294929 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
@@ -154,7 +154,7 @@ public final class DummySurface extends Surface {
    */
   private static boolean deviceNeedsSecureDummySurfaceWorkaround(Context context) {
     return Util.SDK_INT == 24
-        && (Util.MODEL.startsWith("SM-G950") || Util.MODEL.startsWith("SM-G955"))
+        && "samsung".equals(Util.MANUFACTURER)
         && !hasVrModeHighPerformanceSystemFeatureV24(context.getPackageManager());
   }