From db21cbae34a1dbedc830e12b84a494164bfea4cc Mon Sep 17 00:00:00 2001 From: "eunyoung.moon" Date: Thu, 14 Feb 2019 15:02:59 +0900 Subject: [PATCH] Use Uri.toSafeString() in MediaPlayer[2].java. Bug: 123669012 Test: play HLS/RTSP streaming atest CtsNetTestCases:android.net.cts.UriTest Signed-off-by: Eunyoung Moon Change-Id: I3695b0a6f28df3dfff981de2dcd6417d227965ae --- media/apex/java/android/media/MediaPlayer2.java | 2 +- media/java/android/media/MediaPlayer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media/apex/java/android/media/MediaPlayer2.java b/media/apex/java/android/media/MediaPlayer2.java index 89a9540619580..ef30172213bba 100644 --- a/media/apex/java/android/media/MediaPlayer2.java +++ b/media/apex/java/android/media/MediaPlayer2.java @@ -962,7 +962,7 @@ public class MediaPlayer2 implements AutoCloseable return; } } catch (NullPointerException | SecurityException | IOException ex) { - Log.w(TAG, "Couldn't open " + uri + ": " + ex); + Log.w(TAG, "Couldn't open " + uri == null ? "null uri" : uri.toSafeString(), ex); // Fallback to media server } handleDataSource(isCurrent, srcId, uri.toString(), headers, cookies, startPos, endPos); diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 08ce9fc87918a..ebd5295e20d61 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 + ": " + ex); + Log.w(TAG, "Couldn't open " + uri == null ? "null uri" : uri.toSafeString(), ex); return false; } }