commit 48437d716cfb08195e56ba6e89fb6b8f94c0df7d
author Jack Yu <jackyu@google.com> Wed Sep 02 09:16:47 2015 -0700
committer The Android Automerger <android-build@google.com> Wed Sep 02 14:05:20 2015 -0700
tree 67e8c4fa6373f30eaa13ddf385c4592357364840
parent 870b4faa87c2cc67e2cc214da7ed31693ebb13fc

Fixed that severe CMAS messages were not disabled.

This fixed the bad user experience that when the user disables
both extreme and severe emergency messages through the UI, the
user is still able to get the severe emergency messages.

bug: 23644848
Change-Id: I70c26066dd500be0f57516132e68754cbfbb7847

src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
index 02e1adc..8723aa3 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
@@ -247,12 +247,11 @@
                                             .setSubscriptionProperty(mSir.getSubscriptionId(),
                                                     SubscriptionManager.CB_EXTREME_THREAT_ALERT,
                                                     newVal + "");
-                                    if (newVal == 1) {
-                                        SubscriptionManager
-                                                .setSubscriptionProperty(mSir.getSubscriptionId(),
-                                                        SubscriptionManager.CB_SEVERE_THREAT_ALERT,
-                                                        "0");
-                                    }
+                                    SubscriptionManager
+                                            .setSubscriptionProperty(mSir.getSubscriptionId(),
+                                                    SubscriptionManager.CB_SEVERE_THREAT_ALERT,
+                                                    "0");
+
                                     boolean isExtremeAlertChecked =
                                             ((Boolean) newValue).booleanValue();