commit 9c34db46b88c6554a935ef56c5ace45798bbcc4f
author Jordan Liu <jminjie@google.com> Fri Aug 16 14:06:45 2019 -0700
committer Jordan Liu <jminjie@google.com> Wed Aug 28 11:22:24 2019 -0700
tree 2573b4a18bdb7ff725fd3eaa0a8730f48790d450
parent a583cff923f991b7ded76434a59e1dbe9f29c84d

Make CellBroadcast APIs public

Also includes permission checks for enable/disable range, which
Require RECEIVE_EMERGENCY_BROADCAST.

Bug: 135956699
Test: Manually verify that CellBroadcastRecevier is able to call, verify
with CTS that without permissions a SecurityException is thrown
Change-Id: I3ee6c81b353f707caff13f5906b8dc6a66487267

src/java/com/android/internal/telephony/IccSmsInterfaceManager.java

diff --git a/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java b/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java
index ba99657..3558d4e 100644
--- a/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java
+++ b/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java
@@ -806,6 +806,9 @@
     }
 
     public boolean enableCellBroadcastRange(int startMessageId, int endMessageId, int ranType) {
+        mContext.enforceCallingPermission("android.permission.RECEIVE_EMERGENCY_BROADCAST",
+                "enabling cell broadcast range [" + startMessageId + "-" + endMessageId + "]. "
+                        + "ranType=" + ranType);
         if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_GSM) {
             return enableGsmBroadcastRange(startMessageId, endMessageId);
         } else if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_CDMA) {
@@ -816,6 +819,9 @@
     }
 
     public boolean disableCellBroadcastRange(int startMessageId, int endMessageId, int ranType) {
+        mContext.enforceCallingPermission("android.permission.RECEIVE_EMERGENCY_BROADCAST",
+                "disabling cell broadcast range [" + startMessageId + "-" + endMessageId
+                        + "]. ranType=" + ranType);
         if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_GSM ) {
             return disableGsmBroadcastRange(startMessageId, endMessageId);
         } else if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_CDMA)  {

src/java/com/android/internal/telephony/gsm/GsmCellBroadcastHandler.java

diff --git a/src/java/com/android/internal/telephony/gsm/GsmCellBroadcastHandler.java b/src/java/com/android/internal/telephony/gsm/GsmCellBroadcastHandler.java
index bf406cc..9c02f33 100644
--- a/src/java/com/android/internal/telephony/gsm/GsmCellBroadcastHandler.java
+++ b/src/java/com/android/internal/telephony/gsm/GsmCellBroadcastHandler.java
@@ -232,7 +232,7 @@
 
             SmsCbLocation location;
             switch (header.getGeographicalScope()) {
-                case SmsCbMessage.GEOGRAPHICAL_SCOPE_LA_WIDE:
+                case SmsCbMessage.GEOGRAPHICAL_SCOPE_LOCATION_AREA_WIDE:
                     location = new SmsCbLocation(plmn, lac, -1);
                     break;
 

tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java

diff --git a/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java b/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java
index a4b7ae7..689392e 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java
@@ -92,7 +92,8 @@
         doTestGeographicalScopeValue(pdu, (byte)0x00,
                 SmsCbMessage.GEOGRAPHICAL_SCOPE_CELL_WIDE_IMMEDIATE);
         doTestGeographicalScopeValue(pdu, (byte)0x40, SmsCbMessage.GEOGRAPHICAL_SCOPE_PLMN_WIDE);
-        doTestGeographicalScopeValue(pdu, (byte)0x80, SmsCbMessage.GEOGRAPHICAL_SCOPE_LA_WIDE);
+        doTestGeographicalScopeValue(pdu, (byte)0x80,
+                SmsCbMessage.GEOGRAPHICAL_SCOPE_LOCATION_AREA_WIDE);
         doTestGeographicalScopeValue(pdu, (byte)0xC0, SmsCbMessage.GEOGRAPHICAL_SCOPE_CELL_WIDE);
     }