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

Commit 436a76d1 authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "Use Uri.toSafeString() in MediaPlayer[2].java."

parents 62628e13 db21cbae

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;

        }

    }