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

Commit ab884d1f authored by xinhe's avatar xinhe Committed by Android (Google) Code Review
Browse files

Merge "add Cell broadcast Message debug log" into lmp-mr1-dev

parents 8af0cd7e 22f63e19

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

+3 −2
Original line number Diff line number Diff line
@@ -76,14 +76,15 @@ public class CellBroadcastHandler extends WakeLockStateMachine { 
    protected void handleBroadcastSms(SmsCbMessage message) {

        String receiverPermission;

        int appOp;



        Intent intent;

        if (message.isEmergencyMessage()) {

            log("Dispatching emergency SMS CB");

            log("Dispatching emergency SMS CB, SmsCbMessage is: " + message);

            intent = new Intent(Telephony.Sms.Intents.SMS_EMERGENCY_CB_RECEIVED_ACTION);

            receiverPermission = Manifest.permission.RECEIVE_EMERGENCY_BROADCAST;

            appOp = AppOpsManager.OP_RECEIVE_EMERGECY_SMS;

        } else {

            log("Dispatching SMS CB");

            log("Dispatching SMS CB, SmsCbMessage is: " + message);

            intent = new Intent(Telephony.Sms.Intents.SMS_CB_RECEIVED_ACTION);

            receiverPermission = Manifest.permission.RECEIVE_SMS;

            appOp = AppOpsManager.OP_RECEIVE_SMS;

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

+1 −1
Original line number Diff line number Diff line
@@ -2990,7 +2990,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
                break;



            case RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS:

                if (RILJ_LOGD) unsljLog(response);

                if (RILJ_LOGD) unsljLogvRet(response, IccUtils.bytesToHexString((byte[])ret));



                if (mGsmBroadcastSmsRegistrant != null) {

                    mGsmBroadcastSmsRegistrant