From e2367bf6f398e55c680dc64864ba77a320adc987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rmungandrk?= <github@zerodaysec.org>
Date: Tue, 13 Jan 2026 06:01:13 +0700
Subject: [PATCH] Fix Refactor file path handling to use Path API

---
 .../src/main/java/androidx/media3/common/util/Util.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libraries/common/src/main/java/androidx/media3/common/util/Util.java b/libraries/common/src/main/java/androidx/media3/common/util/Util.java
index 2bc8e3e7073..6507247d19d 100644
--- a/libraries/common/src/main/java/androidx/media3/common/util/Util.java
+++ b/libraries/common/src/main/java/androidx/media3/common/util/Util.java
@@ -125,6 +125,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -401,12 +402,12 @@ private static boolean isAppSpecificStorageFileUri(Activity activity, Uri uri) {
       if (uriPath == null) {
         return false;
       }
-      String filePath = new File(uriPath).getCanonicalPath();
-      String internalAppDirectoryPath = activity.getFilesDir().getCanonicalPath();
+      Path filePath = new File(uriPath).toPath().toRealPath();
+      Path internalAppDirectoryPath = activity.getFilesDir().toPath().toRealPath();
       @Nullable File externalAppDirectory = activity.getExternalFilesDir(/* type= */ null);
       @Nullable
-      String externalAppDirectoryPath =
-          externalAppDirectory == null ? null : externalAppDirectory.getCanonicalPath();
+      Path externalAppDirectoryPath =
+          externalAppDirectory == null ? null : externalAppDirectory.toPath().toRealPath();
       return filePath.startsWith(internalAppDirectoryPath)
           || (externalAppDirectoryPath != null && filePath.startsWith(externalAppDirectoryPath));
     } catch (IOException e) {