Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db21cbae authored Feb 14, 2019 by eunyoung.moon Committed by Dongwon Kang Feb 28, 2019

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

parent 7c0532ae

media/apex/java/android/media/MediaPlayer2.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

media/java/android/media/MediaPlayer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}