HDR: Generalize Pixel 6 workaround to TP

PiperOrigin-RevId: 485366659 (cherry picked from commit a65ff85a98f25ae73a08842f1f3f6c5d1433e7e9)
2022-11-01 18:09:01 +00:00 · 2022-11-01 18:09:01 +00:00 · 9b81c2d114
commit 9b81c2d114
parent ecb9d5988e
1 changed files with 2 additions and 2 deletions
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java
@ -293,8 +293,8 @@ import org.checkerframework.dataflow.qual.Pure;
  }

  private static boolean deviceNeedsNoToneMappingWorkaround() {
-    // Pixel build ID does not support tone mapping. See http://b/249297370#comment8.
-    return Build.ID.startsWith("TP1A.220905.004");
+    // Pixel build ID prefix does not support tone mapping. See http://b/249297370#comment8.
+    return Util.MANUFACTURER.equals("Google") && Build.ID.startsWith("TP1A");
  }

  /**