diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2015-02-10 11:07:29 -0800 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-02-10 11:15:30 -0800 |
| commit | 6a34451b4f7c1b6be80cf59124fcddadbb0b96e4 (patch) | |
| tree | c77094fe0d76f5621211c580d1ea209dd77f8a4c | |
| parent | f58422e6775518c352bfd983e46589bbf642692d (diff) | |
| download | android_packages_apps_DeskClock-6a34451b4f7c1b6be80cf59124fcddadbb0b96e4.tar.gz android_packages_apps_DeskClock-6a34451b4f7c1b6be80cf59124fcddadbb0b96e4.tar.bz2 android_packages_apps_DeskClock-6a34451b4f7c1b6be80cf59124fcddadbb0b96e4.zip | |
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
| -rwxr-xr-x | src/com/android/deskclock/Utils.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java index d7a759232..4fcf97c39 100755 --- a/src/com/android/deskclock/Utils.java +++ b/src/com/android/deskclock/Utils.java @@ -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")) { |