Commit bb1337bf authored Aug 25, 2016 by Andre Lago Committed by André Lago Aug 25, 2016

[Ringtone] Return title "None" if Uri is null

Prevent apps reading the title of null ringtones from getting "Unknown
ringtone" as the title for a silent ringtone

Bug: 31084929
Change-Id: Ie9f84bd279633f065722dbde1fbd66289eaca07b

parent 575bb0fd

media/java/android/media/Ringtone.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -258,6 +258,8 @@ public class Ringtone {
		title = uri.getLastPathSegment();
		}
		}
		} else {
		title = context.getString(com.android.internal.R.string.ringtone_silent);
		}

		if (title == null) {