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

Commit 04d0c04e authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Use correct PLMN info for an incoming CB-SMS" am: 74a0dd80 am:... 

Merge "Merge "Use correct PLMN info for an incoming CB-SMS" am: 74a0dd80 am: 625155b1 am: a162557e"
parents a42845b0 9e2b6791

telephony/java/com/android/internal/telephony/cdma/SmsMessage.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import android.os.SystemProperties; 
import android.telephony.PhoneNumberUtils;

import android.telephony.PhoneNumberUtils;

import android.telephony.SmsCbLocation;

import android.telephony.SmsCbLocation;

import android.telephony.SmsCbMessage;

import android.telephony.SmsCbMessage;

import android.telephony.TelephonyManager;

import android.telephony.cdma.CdmaSmsCbProgramData;

import android.telephony.cdma.CdmaSmsCbProgramData;

import android.telephony.Rlog;

import android.telephony.Rlog;

import android.util.Log;

import android.util.Log;
@@ -746,8 +745,10 @@ public class SmsMessage extends SmsMessageBase { 




    /**

    /**

     * Parses a broadcast SMS, possibly containing a CMAS alert.

     * Parses a broadcast SMS, possibly containing a CMAS alert.

     *

     * @param plmn the PLMN for a broadcast SMS

     */

     */

    public SmsCbMessage parseBroadcastSms() {

    public SmsCbMessage parseBroadcastSms(String plmn) {

        BearerData bData = BearerData.decode(mEnvelope.bearerData, mEnvelope.serviceCategory);

        BearerData bData = BearerData.decode(mEnvelope.bearerData, mEnvelope.serviceCategory);

        if (bData == null) {

        if (bData == null) {

            Rlog.w(LOG_TAG, "BearerData.decode() returned null");

            Rlog.w(LOG_TAG, "BearerData.decode() returned null");
@@ -758,7 +759,6 @@ public class SmsMessage extends SmsMessageBase { 
            Rlog.d(LOG_TAG, "MT raw BearerData = " + HexDump.toHexString(mEnvelope.bearerData));

            Rlog.d(LOG_TAG, "MT raw BearerData = " + HexDump.toHexString(mEnvelope.bearerData));

        }

        }





        String plmn = TelephonyManager.getDefault().getNetworkOperator();

        SmsCbLocation location = new SmsCbLocation(plmn);

        SmsCbLocation location = new SmsCbLocation(plmn);





        return new SmsCbMessage(SmsCbMessage.MESSAGE_FORMAT_3GPP2,

        return new SmsCbMessage(SmsCbMessage.MESSAGE_FORMAT_3GPP2,