Regional: Support Channel 60 switch in CellBroadcast

There is requirement from India that Channel 60 needs to be
disabled by default. But currently Channel 60 is enabled and
there is no checkbox to disable it in UI. We add Channel 60
checkbox in UI, and control Channel 60 disable/enable by
overlay key.
There are 2 keys to control Channel 60:
show_india_settings controls Channel 60 checkbox display,
default is false.
def_channel_60_enabled controls if Channel 60 is enabled,
default is true.
Change-Id: I6389efa731a303df165e1b0b0dc5904d950b68b0
CRs-Fixed: 776615

Cell Broadcast for channel 60 and widget support

- Add support for cell broadcasts on channel 60
- For Brazil, send cell broadcast to app widget
  provider
Change-Id: I475a76c72882f3164ebd8b047505c492dcf4f6dd
CRs-Fixed: 576013

1 files changed, 7 insertions, 4 deletions

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiverApp.java b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiverApp.java
index b9e60398..2b62177f 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiverApp.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiverApp.java
@@ -21,6 +21,8 @@ import android.telephony.CellBroadcastMessage;
 import android.util.Log;
 import android.preference.PreferenceManager;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -43,7 +45,8 @@ public class CellBroadcastReceiverApp extends Application {
             new ArrayList<CellBroadcastMessage>(4);
 
     /** Latest area info cell broadcast received. */
-    private static CellBroadcastMessage sLatestAreaInfo;
+    private static Map<Integer, CellBroadcastMessage> sLatestAreaInfo =
+            new HashMap<Integer, CellBroadcastMessage>();
 
     /** Adds a new unread non-emergency message and returns the current list. */
     static ArrayList<CellBroadcastMessage> addNewMessageToList(CellBroadcastMessage message) {
@@ -58,11 +61,11 @@ public class CellBroadcastReceiverApp extends Application {
 
     /** Saves the latest area info broadcast received. */
     static void setLatestAreaInfo(CellBroadcastMessage areaInfo) {
-        sLatestAreaInfo = areaInfo;
+        sLatestAreaInfo.put(areaInfo.getSubId(), areaInfo);
     }
 
     /** Returns the latest area info broadcast received. */
-    static CellBroadcastMessage getLatestAreaInfo() {
-        return sLatestAreaInfo;
+    static CellBroadcastMessage getLatestAreaInfo(int subId) {
+        return sLatestAreaInfo.get(subId);
     }
 }