Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaee65f5 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Make CellBroadcast APIs public" am: f8f57c29 am: 08489a2f 

am: b5de1717

Change-Id: I49745d672c90617646f18129a0c9a793995ec373
parents cc6889ca b5de1717

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

+6 −0
Original line number Diff line number Diff line
@@ -806,6 +806,9 @@ public class IccSmsInterfaceManager { 
    }



    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 class IccSmsInterfaceManager { 
    }



    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

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ public class GsmCellBroadcastHandler extends CellBroadcastHandler { 


            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

+2 −1
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ public class GsmSmsCbTest extends AndroidTestCase { 
        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);

    }