Commit d5641b50 authored Feb 10, 2015 by Adnan Begovic Committed by Matt Garnes Feb 10, 2015

DeskClock: Protected against possible NPE from null uri.

  From BUGDUMP-648323 (12-20150130-20150206)

  "java.lang.NullPointerException: Attempt to invoke virtual method 'boolean android.net.Uri.equals(java.lang.Object)' on a null object reference
    at com.android.deskclock.Utils.isRingToneUriValid(Utils.java:685)
    at com.android.deskclock.AlarmClockFragment$AlarmItemAdapter.bindView(AlarmClockFragment.java:1014)
    at com.android.deskclock.AlarmClockFragment$AlarmItemAdapter.getView(AlarmClockFragment.java:936)
    at android.widget.AbsListView.obtainView(AbsListView.java:2346)
    ...

Change-Id: I092d4da0b29e400241eff82935b1f47080bc8d8a
(cherry picked from commit 6a34451b)

parent 79b940b9

src/com/android/deskclock/Utils.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -682,6 +682,10 @@ public class Utils {
		}

		public static boolean isRingToneUriValid(Context context, Uri uri) {
		if (uri == null) {
		return false;
		}

		if (uri.equals(AlarmMultiPlayer.RANDOM_URI) \|\| uri.equals(Alarm.NO_RINGTONE_URI)) {
		return true;
		} else if (uri.getScheme().contentEquals("file")) {