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

Unverified Commit baf3d844 authored by LuK1337's avatar LuK1337 Committed by Michael Bestas
Browse files

Pass correct value to setPreferredNetworkType() for RIL version < 1.4 

Change-Id: Id14be66a2ea4e85b6504bc03fd7d2f038185c17d
parent 683b3cd4

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

+2 −1
Original line number Diff line number Diff line
@@ -3036,7 +3036,8 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            mMetrics.writeSetPreferredNetworkType(mPhoneId, networkType);



            try {

                networkProxy.setPreferredNetworkTypeBitmap(rr.mSerial, mAllowedNetworkTypesBitmask);

                networkProxy.setPreferredNetworkTypeBitmap(

                        rr.mSerial, mAllowedNetworkTypesBitmask, networkType);

            } catch (RemoteException | RuntimeException e) {

                handleRadioProxyExceptionForRR(HAL_SERVICE_NETWORK, "setPreferredNetworkType", e);

            }

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

+3 −2
Original line number Diff line number Diff line
@@ -389,16 +389,17 @@ public class RadioNetworkProxy extends RadioServiceProxy { 
     * Call IRadioNetwork#setPreferredNetworkTypeBitmap

     * @param serial Serial number of request

     * @param networkTypesBitmask Preferred network types bitmask to set

     * @param networkType Preferred network type to set for RIL version < 1.4

     * @throws RemoteException

     */

    public void setPreferredNetworkTypeBitmap(int serial, int networkTypesBitmask)

    public void setPreferredNetworkTypeBitmap(int serial, int networkTypesBitmask, int networkType)

            throws RemoteException {

        if (isEmpty() || mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_6)) return;

        if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_4)) {

            ((android.hardware.radio.V1_4.IRadio) mRadioProxy).setPreferredNetworkTypeBitmap(serial,

                    RILUtils.convertToHalRadioAccessFamily(networkTypesBitmask));

        } else {

            mRadioProxy.setPreferredNetworkType(serial, networkTypesBitmask);

            mRadioProxy.setPreferredNetworkType(serial, networkType);

        }

    }