commit 1a94a643ae1cb7413f342a46c5fb4327f4b0e3cf
author Todd Kennedy <toddke@google.com> Fri Jan 11 21:43:06 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 11 21:43:06 2019 +0000
tree 8cc4729139d4f82b7d907b0f7d14336f31029f32
parent ead5a3a5e19f724f0596d8871247b96cb01f6848
parent f776cdec61261a9e5eccd6e7ffdcb9f0cba7cce8

Merge "Support RRO for ringtones, notifications and alarms"

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

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index cd78c82..84565ad 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -1542,11 +1542,11 @@
         if (!TextUtils.isEmpty(values.getAsString(MediaColumns.DATA))) {
             final String data = values.getAsString(MediaColumns.DATA);
 
-            if (TextUtils.isEmpty(MediaColumns.DISPLAY_NAME)) {
+            if (TextUtils.isEmpty(values.getAsString(MediaColumns.DISPLAY_NAME))) {
                 final String displayName = data.substring(data.lastIndexOf('/') + 1);
                 values.put(MediaColumns.DISPLAY_NAME, displayName);
             }
-            if (TextUtils.isEmpty(MediaColumns.MIME_TYPE)) {
+            if (TextUtils.isEmpty(values.getAsString(MediaColumns.MIME_TYPE))) {
                 final String ext = data.substring(data.lastIndexOf('.') + 1);
                 values.put(MediaColumns.MIME_TYPE, MimeUtils.guessMimeTypeFromExtension(ext));
             }