commit 2d1fb51070223d68cc379056d3f7d3e05afdb03b
author fengjinlan <fengjinlan@xiaomi.com> Tue Dec 08 22:32:25 2020 +0800
committer Sahana Rao <sahanas@google.com> Thu Dec 24 11:59:43 2020 +0000
tree 8cc1bae5ab173e9b89433058a62b8093b142ebc4
parent e5e14a36e05066ed0b9025fd88e1ab22a88e8f36

Match case insensitive path while saving & restoring deleted ids

Save deleted path in lower case and compare lower case path while
restoring deleted id.

Bug: 175527658
Test: atest packages/providers/MediaProvider
Change-Id: I68fe7941cd2be31630de4519f01cd79c4602b91a
Signed-off-by: fengjinlan <fengjinlan@xiaomi.com>

src/com/android/providers/media/LocalCallingIdentity.java

diff --git a/src/com/android/providers/media/LocalCallingIdentity.java b/src/com/android/providers/media/LocalCallingIdentity.java
index 58bdf37..9e2c052 100644
--- a/src/com/android/providers/media/LocalCallingIdentity.java
+++ b/src/com/android/providers/media/LocalCallingIdentity.java
@@ -59,6 +59,8 @@
 
 import com.android.providers.media.util.LongArray;
 
+import java.util.Locale;
+
 public class LocalCallingIdentity {
     public final int pid;
     public final int uid;
@@ -394,7 +396,7 @@
 
     public void addDeletedRowId(@NonNull String path, long id) {
         synchronized (lock) {
-            rowIdOfDeletedPaths.put(path, id);
+            rowIdOfDeletedPaths.put(path.toLowerCase(Locale.ROOT), id);
         }
     }
 
@@ -412,7 +414,7 @@
 
     public long getDeletedRowId(@NonNull String path) {
         synchronized (lock) {
-            return rowIdOfDeletedPaths.getOrDefault(path, UNKNOWN_ROW_ID);
+            return rowIdOfDeletedPaths.getOrDefault(path.toLowerCase(Locale.ROOT), UNKNOWN_ROW_ID);
         }
     }
 }