From 33c666d955ff41b6a299e2b029e22afa8053f867 Mon Sep 17 00:00:00 2001
From: Youming Ye <paulye@google.com>
Date: Mon, 1 Apr 2019 15:52:50 -0700
Subject: [PATCH] Fix ringtone null pointer exception

Bug: 128468578
Test: Build
Change-Id: If65f0194712c8358fdbd88e7d04478f8395a012b
---
 media/java/android/media/MediaPlayer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 040152ac9b1d9..1937edd69975e 100644
--- 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;
         }
     }