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

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

Merge "Modify getLteOnCdmaModeStatic method as slotId agnostic."

parents 4467696f 6cf5e2ff

telephony/java/android/telephony/TelephonyManager.java

+3 −7
Original line number Diff line number Diff line
@@ -1016,10 +1016,6 @@ public class TelephonyManager { 
    private static final String sLteOnCdmaProductType =

        SystemProperties.get(TelephonyProperties.PROPERTY_LTE_ON_CDMA_PRODUCT_TYPE, "");



    /** @hide */

     public static int getLteOnCdmaModeStatic() {

        return getLteOnCdmaModeStatic(getDefaultSim());

    }



    /**

     * Return if the current radio is LTE on CDMA. This
@@ -1031,12 +1027,12 @@ public class TelephonyManager { 
     *

     * @hide

     */

    public static int getLteOnCdmaModeStatic(int slotId) {

    public static int getLteOnCdmaModeStatic() {

        int retVal;

        int curVal;

        String productType = "";



        curVal = getTelephonyProperty(TelephonyProperties.PROPERTY_LTE_ON_CDMA_DEVICE, slotId,

        curVal = SystemProperties.getInt(TelephonyProperties.PROPERTY_LTE_ON_CDMA_DEVICE,

                PhoneConstants.LTE_ON_CDMA_UNKNOWN);

        retVal = curVal;

        if (retVal == PhoneConstants.LTE_ON_CDMA_UNKNOWN) {