From 5d8a83f924fe6bf3f17c37ca440fba3d1cb141e0 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Thu, 16 Feb 2023 13:23:29 +0000 Subject: [PATCH] Remove Pixel watch check It's unlikely anyone will try to use Transformer on watches. PiperOrigin-RevId: 510115645 --- .../media3/transformer/DefaultDecoderFactory.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java index 73e2ff23aa..b29aad6d9d 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java @@ -118,11 +118,9 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; } private static boolean deviceNeedsNoToneMappingWorkaround() { - // Pixel build ID prefix does not support tone mapping. See http://b/249297370#comment8. - return Util.MANUFACTURER.equals("Google") - && ( - /* Pixel 6 */ Build.ID.startsWith("TP1A") - || Build.ID.startsWith(/* Pixel Watch */ "rwd9.220429.053")); + // Some Pixel 6 builds report support for tone mapping but the feature doesn't work + // (see http://b/249297370#comment8). + return Util.MANUFACTURER.equals("Google") && Build.ID.startsWith("TP1A"); } @RequiresNonNull("#1.sampleMimeType")