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

Commit c5e72e8c authored by Nathan Harold's avatar Nathan Harold Committed by Automerger Merge Worker
Browse files

Merge "Remove calls to getLteOnCdmaModeStatic()" am: 3f8bfc7a am: a30426de... 

Merge "Remove calls to getLteOnCdmaModeStatic()" am: 3f8bfc7a am: a30426de am: 8585e69f am: 798e9566

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

Change-Id: I236fadea39a372831d5e7cf0f7e99d7a70d6d63f
parents acf808a9 798e9566

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

+0 −8
Original line number Diff line number Diff line
@@ -891,14 +891,6 @@ public abstract class BaseCommands implements CommandsInterface { 
        }

    }



    /**

     * {@inheritDoc}

     */

    @Override

    public int getLteOnCdmaMode() {

        return TelephonyManager.getLteOnCdmaModeStatic();

    }



    /**

     * {@inheritDoc}

     */

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

+0 −10
Original line number Diff line number Diff line
@@ -1886,16 +1886,6 @@ public interface CommandsInterface { 
     */

    void setLogicalToPhysicalSlotMapping(int[] physicalSlots, Message result);



    /**

     * Return if the current radio is LTE on CDMA. This

     * is a tri-state return value as for a period of time

     * the mode may be unknown.

     *

     * @return {@link PhoneConstants#LTE_ON_CDMA_UNKNOWN}, {@link PhoneConstants#LTE_ON_CDMA_FALSE}

     * or {@link PhoneConstants#LTE_ON_CDMA_TRUE}

     */

    public int getLteOnCdmaMode();



    /**

     * Request the SIM application on the UICC to perform authentication

     * challenge/response algorithm. The data string and challenge response are

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

+2 −2
Original line number Diff line number Diff line
@@ -4373,9 +4373,9 @@ public class GsmCdmaPhone extends Phone { 
        return mWakeLock;

    }



    @Override

    public int getLteOnCdmaMode() {

        int currentConfig = super.getLteOnCdmaMode();

        int currentConfig = TelephonyProperties.lte_on_cdma_device()

                .orElse(PhoneConstants.LTE_ON_CDMA_FALSE);

        int lteOnCdmaModeDynamicValue = currentConfig;



        UiccCardApplication cdmaApplication =

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

+0 −12
Original line number Diff line number Diff line
@@ -3569,18 +3569,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        mNotifier.notifyDataConnectionFailed(this, apnType, apn, failCause);

    }



    /**

     * Return if the current radio is LTE on CDMA. This

     * is a tri-state return value as for a period of time

     * the mode may be unknown.

     *

     * @return {@link PhoneConstants#LTE_ON_CDMA_UNKNOWN}, {@link PhoneConstants#LTE_ON_CDMA_FALSE}

     * or {@link PhoneConstants#LTE_ON_CDMA_TRUE}

     */

    public int getLteOnCdmaMode() {

        return mCi.getLteOnCdmaMode();

    }



    /**

     * Sets the SIM voice message waiting indicator records.

     * @param line GSM Subscriber Profile Number, one-based. Only '1' is supported

tests/telephonytests/src/com/android/internal/telephony/SimulatedCommandsVerifier.java

+0 −5
Original line number Diff line number Diff line
@@ -1222,11 +1222,6 @@ public class SimulatedCommandsVerifier implements CommandsInterface { 
    public void setLogicalToPhysicalSlotMapping(int[] physicalSlots, Message result) {

    }



    @Override

    public int getLteOnCdmaMode() {

        return 0;

    }



    @Override

    public void requestIccSimAuthentication(int authContext, String data, String aid,

                                            Message response) {