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

Commit 80ee8068 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Notify CDMA call Settings when CDMA USSD codes are unavailable" into... 

Merge "Notify CDMA call Settings when CDMA USSD codes are unavailable" into sc-dev am: e7ddfe27 am: c9ee4750

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/15305931

Change-Id: I863eadb14f7119809f86b10033fc9aefd199cf26
parents b6bcbd65 c9ee4750

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

+38 −6
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ public class GsmCdmaPhone extends Phone { 
    private IccSmsInterfaceManager mIccSmsInterfaceManager;



    private boolean mResetModemOnRadioTechnologyChange = false;

    private boolean mSsOverCdmaSupported = false;



    private int mRilVersion;

    private boolean mBroadcastEmergencyCallStateChanges = false;
@@ -2208,6 +2209,11 @@ public class GsmCdmaPhone extends Phone { 
        return false;

    }



    private void updateSsOverCdmaSupported(PersistableBundle b) {

        if (b == null) return;

        mSsOverCdmaSupported = b.getBoolean(CarrierConfigManager.KEY_SUPPORT_SS_OVER_CDMA_BOOL);

    }



    @Override

    public boolean useSsOverIms(Message onComplete) {

        boolean isUtEnabled = isUtEnabled();
@@ -2247,9 +2253,17 @@ public class GsmCdmaPhone extends Phone { 
                }

                mCi.queryCallForwardStatus(commandInterfaceCFReason, serviceClass, null, resp);

            }

        } else {

            if (!mSsOverCdmaSupported) {

                // If SS over CDMA is not supported and UT is not at the time, notify the user of

                // the error and disable the option.

                AsyncResult.forMessage(onComplete, null,

                        new CommandException(CommandException.Error.INVALID_STATE,

                                "Call Forwarding over CDMA unavailable"));

            } else {

                loge("getCallForwardingOption: not possible in CDMA, just return empty result");

                AsyncResult.forMessage(onComplete, makeEmptyCallForward(), null);

            }

            onComplete.sendToTarget();

        }

    }
@@ -2297,7 +2311,7 @@ public class GsmCdmaPhone extends Phone { 
                        timerSeconds,

                        resp);

            }

        } else {

        } else if (mSsOverCdmaSupported) {

            String formatNumber = GsmCdmaConnection.formatDialString(dialingNumber);

            String cfNumber = CdmaMmiCode.getCallForwardingPrefixAndNumber(

                    commandInterfaceCFAction, commandInterfaceCFReason, formatNumber);
@@ -2314,6 +2328,10 @@ public class GsmCdmaPhone extends Phone { 


            AsyncResult.forMessage(onComplete, CommandsInterface.SS_STATUS_UNKNOWN, null);

            onComplete.sendToTarget();

        } else {

            loge("setCallForwardingOption: SS over CDMA not supported, can not complete");

            AsyncResult.forMessage(onComplete, CommandsInterface.SS_STATUS_UNKNOWN, null);

            onComplete.sendToTarget();

        }

    }
@@ -2437,8 +2455,17 @@ public class GsmCdmaPhone extends Phone { 
            //class parameter in call waiting interrogation  to network

            mCi.queryCallWaiting(CommandsInterface.SERVICE_CLASS_NONE, onComplete);

        } else {

            int arr[] = {CommandsInterface.SS_STATUS_UNKNOWN, CommandsInterface.SERVICE_CLASS_NONE};

            if (!mSsOverCdmaSupported) {

                // If SS over CDMA is not supported and UT is not at the time, notify the user of

                // the error and disable the option.

                AsyncResult.forMessage(onComplete, null,

                        new CommandException(CommandException.Error.INVALID_STATE,

                                "Call Waiting over CDMA unavailable"));

            } else {

                int[] arr =

                        {CommandsInterface.SS_STATUS_UNKNOWN, CommandsInterface.SERVICE_CLASS_NONE};

                AsyncResult.forMessage(onComplete, arr, null);

            }

            onComplete.sendToTarget();

        }

    }
@@ -2466,7 +2493,7 @@ public class GsmCdmaPhone extends Phone { 


        if (isPhoneTypeGsm()) {

            mCi.setCallWaiting(enable, serviceClass, onComplete);

        } else {

        } else if (mSsOverCdmaSupported) {

            String cwPrefix = CdmaMmiCode.getCallWaitingPrefix(enable);

            Rlog.i(LOG_TAG, "setCallWaiting in CDMA : dial for set call waiting" + " prefix= " + cwPrefix);
@@ -2480,6 +2507,10 @@ public class GsmCdmaPhone extends Phone { 


            AsyncResult.forMessage(onComplete, CommandsInterface.SS_STATUS_UNKNOWN, null);

            onComplete.sendToTarget();

        } else {

            loge("setCallWaiting: SS over CDMA not supported, can not complete");

            AsyncResult.forMessage(onComplete, CommandsInterface.SS_STATUS_UNKNOWN, null);

            onComplete.sendToTarget();

        }

    }
@@ -2932,6 +2963,7 @@ public class GsmCdmaPhone extends Phone { 
                updateCdmaRoamingSettingsAfterCarrierConfigChanged(b);



                updateNrSettingsAfterCarrierConfigChanged(b);

                updateSsOverCdmaSupported(b);

                loadAllowedNetworksFromSubscriptionDatabase();

                // Obtain new radio capabilities from the modem, since some are SIM-dependent

                mCi.getRadioCapability(obtainMessage(EVENT_GET_RADIO_CAPABILITY));