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());
   }