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

Commit 6224865b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs" am:... 

Merge "use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs" am: 805a2237 am: adb37634

Change-Id: I1239d2a3e9b3d488158e54c2b477a618a3a736f0
parents 7b1b25b2 adb37634

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

+5 −4
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.os.UserManager; 
import android.provider.Telephony;

import android.telephony.CarrierConfigManager;

import android.telephony.Rlog;

import android.telephony.SmsCbMessage;

import android.telephony.SmsManager;

import android.telephony.SmsMessage;

import android.telephony.SubscriptionManager;
@@ -901,9 +902,9 @@ public class IccSmsInterfaceManager { 
        mContext.enforceCallingPermission("android.permission.RECEIVE_EMERGENCY_BROADCAST",

                "enabling cell broadcast range [" + startMessageId + "-" + endMessageId + "]. "

                        + "ranType=" + ranType);

        if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_GSM) {

        if (ranType == SmsCbMessage.MESSAGE_FORMAT_3GPP) {

            return enableGsmBroadcastRange(startMessageId, endMessageId);

        } else if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_CDMA) {

        } else if (ranType == SmsCbMessage.MESSAGE_FORMAT_3GPP2) {

            return enableCdmaBroadcastRange(startMessageId, endMessageId);

        } else {

            throw new IllegalArgumentException("Not a supported RAN Type");
@@ -914,9 +915,9 @@ public class IccSmsInterfaceManager { 
        mContext.enforceCallingPermission("android.permission.RECEIVE_EMERGENCY_BROADCAST",

                "disabling cell broadcast range [" + startMessageId + "-" + endMessageId

                        + "]. ranType=" + ranType);

        if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_GSM ) {

        if (ranType == SmsCbMessage.MESSAGE_FORMAT_3GPP) {

            return disableGsmBroadcastRange(startMessageId, endMessageId);

        } else if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_CDMA)  {

        } else if (ranType == SmsCbMessage.MESSAGE_FORMAT_3GPP2)  {

            return disableCdmaBroadcastRange(startMessageId, endMessageId);

        } else {

            throw new IllegalArgumentException("Not a supported RAN Type");