diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 7ddda64c83..4c0354fad7 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -94,6 +94,8 @@ * Fix potential NPE when removing media sources from a DynamicConcatenatingMediaSource ([#3796](https://github.com/google/ExoPlayer/issues/3796)). +* Check `sys.display-size` on Philips ATVs + ([#3807](https://github.com/google/ExoPlayer/issues/3807)). ### 2.6.1 ### diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java index f4637ebde6..cd643f2df4 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java @@ -1334,7 +1334,11 @@ public final class Util { if ("Sony".equals(Util.MANUFACTURER) && Util.MODEL.startsWith("BRAVIA") && context.getPackageManager().hasSystemFeature("com.sony.dtv.hardware.panel.qfhd")) { return new Point(3840, 2160); - } else if ("NVIDIA".equals(Util.MANUFACTURER) && Util.MODEL.contains("SHIELD")) { + } else if (("NVIDIA".equals(Util.MANUFACTURER) && Util.MODEL.contains("SHIELD")) + || ("philips".equals(Util.toLowerInvariant(Util.MANUFACTURER)) + && (Util.MODEL.startsWith("QM1") + || Util.MODEL.equals("QV151E") + || Util.MODEL.equals("TPM171E")))) { // Attempt to read sys.display-size. String sysDisplaySize = null; try {