Merge "Fix ringtone null pointer exception"

2019-04-02 20:23:35 +00:00
parent 18c3f9c551 33c666d955
commit bb261a3caf
1 changed files with 1 additions and 1 deletions
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -1103,7 +1103,7 @@ public class MediaPlayer extends PlayerBase
            setDataSource(afd);
            return true;
        } catch (NullPointerException | SecurityException | IOException ex) {
-            Log.w(TAG, "Couldn't open " + uri == null ? "null uri" : uri.toSafeString(), ex);
+            Log.w(TAG, "Couldn't open " + (uri == null ? "null uri" : uri.toSafeString()), ex);
            return false;
        }
    }