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

Commit 9ccb9893 authored by Paul Sliwowski's avatar Paul Sliwowski Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in DB upgrade." into ics-ub-clock-amazon

parents 1585e2a5 fd8ddaaa

src/com/android/deskclock/provider/ClockDatabaseHelper.java

+3 −1
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ import android.database.Cursor; 
import android.database.SQLException;

import android.database.sqlite.SQLiteDatabase;

import android.database.sqlite.SQLiteOpenHelper;

import android.media.RingtoneManager;

import android.net.Uri;

import android.text.TextUtils;



import com.android.deskclock.Log;

import com.android.deskclock.alarms.AlarmStateManager;
@@ -181,7 +183,7 @@ class ClockDatabaseHelper extends SQLiteOpenHelper { 
                if ("silent".equals(alertString)) {

                    alarm.alert = Alarm.NO_RINGTONE_URI;

                } else {

                    alarm.alert = alertString.isEmpty() ? null : Uri.parse(alertString);

                    alarm.alert = TextUtils.isEmpty(alertString) ? null : Uri.parse(alertString);

                }



                // Save new version of alarm and create alarminstance for it