From 25e56474bc48d5dc490241699c36739b58ccf7cf Mon Sep 17 00:00:00 2001
From: tofunmi <tofunmi@google.com>
Date: Thu, 16 May 2024 08:39:44 -0700
Subject: [PATCH] Check for .heif extension in File types inference

PiperOrigin-RevId: 634409758
---
 .../common/src/main/java/androidx/media3/common/FileTypes.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/common/src/main/java/androidx/media3/common/FileTypes.java b/libraries/common/src/main/java/androidx/media3/common/FileTypes.java
index 5b43543694..38324d2f1e 100644
--- a/libraries/common/src/main/java/androidx/media3/common/FileTypes.java
+++ b/libraries/common/src/main/java/androidx/media3/common/FileTypes.java
@@ -179,6 +179,7 @@ public final class FileTypes {
   private static final String EXTENSION_BMP = ".bmp";
   private static final String EXTENSION_DIB = ".dib";
   private static final String EXTENSION_HEIC = ".heic";
+  private static final String EXTENSION_HEIF = ".heif";
   private static final String EXTENSION_AVIF = ".avif";
 
   private FileTypes() {}
@@ -329,7 +330,7 @@ public final class FileTypes {
       return FileTypes.WEBP;
     } else if (filename.endsWith(EXTENSION_BMP) || filename.endsWith(EXTENSION_DIB)) {
       return FileTypes.BMP;
-    } else if (filename.endsWith(EXTENSION_HEIC)) {
+    } else if (filename.endsWith(EXTENSION_HEIC) || filename.endsWith(EXTENSION_HEIF)) {
       return FileTypes.HEIF;
     } else if (filename.endsWith(EXTENSION_AVIF)) {
       return FileTypes.AVIF;