commit 01f6d2d71d3e1c454bbadf93fede492d75be1a82
author Jeff Sharkey <jsharkey@android.com> Sun May 31 17:03:31 2020 -0600
committer Jeff Sharkey <jsharkey@android.com> Sun May 31 17:03:33 2020 -0600
tree 568382aca3bc1f95dc32c7ac12ad45394ce07674
parent a3b3786bede275345ec0ab98834c9e344af1cf77

Safer Audio.keyFor() behavior for null strings.

Apps may be relying on the original Audio.keyFor() behavior that
returned empty strings instead of null, so restore that original
behavior.

Bug: 149776788
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Id5858ab08dc2e1b9199b96ddd7441e36ef4c126b

apex/framework/java/android/provider/MediaStore.java

diff --git a/apex/framework/java/android/provider/MediaStore.java b/apex/framework/java/android/provider/MediaStore.java
index 80b97b2..8075cff 100644
--- a/apex/framework/java/android/provider/MediaStore.java
+++ b/apex/framework/java/android/provider/MediaStore.java
@@ -2597,7 +2597,7 @@
          */
         @Deprecated
         public static @Nullable String keyFor(@Nullable String name) {
-            if (TextUtils.isEmpty(name)) return null;
+            if (TextUtils.isEmpty(name)) return "";
 
             if (UNKNOWN_STRING.equals(name)) {
                 return "01";
@@ -2606,7 +2606,7 @@
             final boolean sortFirst = name.startsWith("\001");
 
             name = PATTERN_TRIM_BEFORE.matcher(name).replaceAll("");
-            if (TextUtils.isEmpty(name)) return null;
+            if (TextUtils.isEmpty(name)) return "";
 
             final Collator c = Collator.getInstance(Locale.ROOT);
             c.setStrength(Collator.PRIMARY);