summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-05-01 14:03:31 +0800
committerBrint E. Kriebel <bekit@cyngn.com>2014-08-25 20:04:16 +0000
commitfce93f2e810adff0c7574697d38be9a3c1f27560 (patch)
treee01dab37a7c5277a7ccd7b0c3345d0dfe5bd50b6
parentff44b7ac5d3b8550b316b24be6ec336e2a92cb1b (diff)
downloadandroid_packages_apps_DeskClock-fce93f2e810adff0c7574697d38be9a3c1f27560.tar.gz
android_packages_apps_DeskClock-fce93f2e810adff0c7574697d38be9a3c1f27560.tar.bz2
android_packages_apps_DeskClock-fce93f2e810adff0c7574697d38be9a3c1f27560.zip
DeskClock: Fix DeskClock crash when click dismiss clock
It is the NullPointerException which cause this crash happen Add a condition to exclude the NullPointerException. CRs-fixed: 650830 Change-Id: Id45a1ce757dc1876f56bd5d49ba5376760ec4cb8
-rw-r--r--src/com/android/deskclock/alarms/AlarmStateManager.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/deskclock/alarms/AlarmStateManager.java b/src/com/android/deskclock/alarms/AlarmStateManager.java
index d9e4fb1f1..e6064e0e9 100644
--- a/src/com/android/deskclock/alarms/AlarmStateManager.java
+++ b/src/com/android/deskclock/alarms/AlarmStateManager.java
@@ -787,7 +787,11 @@ public final class AlarmStateManager extends BroadcastReceiver {
Uri uri = intent.getData();
AlarmInstance instance = AlarmInstance.getInstance(context.getContentResolver(),
AlarmInstance.getId(uri));
-
+ if (instance == null) {
+ // Not a big deal, but it shouldn't happen
+ Log.e("Can not show and dismiss alarm for unknown instance: " + uri);
+ return;
+ }
long alarmId = instance.mAlarmId == null ? Alarm.INVALID_ID : instance.mAlarmId;
Intent viewAlarmIntent = Alarm.createIntent(context, DeskClock.class, alarmId);
viewAlarmIntent.putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.ALARM_TAB_INDEX);