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

Commit 726b437c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "TelephonyTests: Clean run of tests on emulator"

parents 2815177d 5816ea1e

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

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ public class SmsMessage extends SmsMessageBase { 
    /**

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

     */

    SmsCbMessage parseBroadcastSms() {

    public SmsCbMessage parseBroadcastSms() {

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

        if (bData == null) {

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

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

+7 −1
Original line number Diff line number Diff line
@@ -247,7 +247,9 @@ public class GSMPhone extends PhoneBase { 
            mCT.dispose();

            mDcTracker.dispose();

            mSST.dispose();

            if (mSimPhoneBookIntManager != null) {

                mSimPhoneBookIntManager.dispose();

            }

            mSubInfo.dispose();

        }

    }
@@ -1522,6 +1524,10 @@ public class GSMPhone extends PhoneBase { 
            return;

        }



        if (mSimPhoneBookIntManager == null) {

            return;

        }



        mSimPhoneBookIntManager.setIccCard(mUiccController.getUiccCard());

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import java.util.List; 
/**

 * {@hide}

 */

class GsmCall extends Call {

public class GsmCall extends Call {

    /*************************** Instance Variables **************************/



    /*package*/ GsmCallTracker mOwner;

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

+2 −2
Original line number Diff line number Diff line
@@ -395,8 +395,6 @@ public class GsmConnection extends Connection { 
                    } else {

                        return DisconnectCause.OUT_OF_SERVICE;

                    }

                } else if (uiccAppState != AppState.APPSTATE_READY) {

                    return DisconnectCause.ICC_ERROR;

                } else if (causeCode == CallFailCause.ERROR_UNSPECIFIED) {

                    if (phone.mSST.mRestrictedState.isCsRestricted()) {

                        return DisconnectCause.CS_RESTRICTED;
@@ -409,6 +407,8 @@ public class GsmConnection extends Connection { 
                    }

                } else if (causeCode == CallFailCause.NORMAL_CLEARING) {

                    return DisconnectCause.NORMAL;

                } else if (uiccAppState != AppState.APPSTATE_READY) {

                    return DisconnectCause.ICC_ERROR;

                } else {

                    // If nothing else matches, report unknown call drop reason

                    // to app, not NORMAL call end.

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

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class GsmSmsCbMessage { 
     *

     * @param pdus PDU bytes

     */

    static SmsCbMessage createSmsCbMessage(SmsCbHeader header, SmsCbLocation location,

    public static SmsCbMessage createSmsCbMessage(SmsCbHeader header, SmsCbLocation location,

            byte[][] pdus) throws IllegalArgumentException {

        if (header.isEtwsPrimaryNotification()) {

            return new SmsCbMessage(SmsCbMessage.MESSAGE_FORMAT_3GPP,