diff options
| author | 2019-02-14 15:02:59 +0900 | |
|---|---|---|
| committer | 2019-02-28 16:59:53 -0800 | |
| commit | db21cbae34a1dbedc830e12b84a494164bfea4cc (patch) | |
| tree | 60eeee744b22e0f6b37b3cfabb6ae92c0187a8f4 | |
| parent | 7c0532ae7635e43fe56d4e2296815b89a0d961e7 (diff) | |
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 <eunyoung.moon@lge.com>
Change-Id: I3695b0a6f28df3dfff981de2dcd6417d227965ae
| -rw-r--r-- | media/apex/java/android/media/MediaPlayer2.java | 2 | ||||
| -rw-r--r-- | 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 89a954061958..ef30172213bb 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 08ce9fc87918..ebd5295e20d6 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; } } |