summaryrefslogtreecommitdiffstats
path: root/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java')
-rw-r--r--src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
index f2509284..37fdf42e 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
@@ -45,7 +45,8 @@ public class CellBroadcastAlertDialog extends CellBroadcastAlertFullScreen {
// Listen for the screen turning off so that when the screen comes back
// on, the user does not need to unlock the phone to dismiss the alert.
- if (CellBroadcastConfigService.isEmergencyAlertMessage(getLatestMessage())) {
+ CellBroadcastMessage msg = getLatestMessage();
+ if (msg != null && msg.isEmergencyAlertMessage()) {
mScreenOffReceiver = new ScreenOffReceiver();
registerReceiver(mScreenOffReceiver,
new IntentFilter(Intent.ACTION_SCREEN_OFF));