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

Commit 2c77d9be authored by SongFerngWang's avatar SongFerngWang
Browse files

Using getAllowedNetworkTypesBitmap after HAL1.6 

Bug: 181221990
Test: build pass. Manual test via radioInfo set/get allowed network
type.(PASS)

Change-Id: I20d71c15b8550dc16af1fd496c0af2ed0a09e9c1
parent 946e7c6e

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -2448,8 +2448,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
     * @param response is callback message to report network types bitmask

     * @param response is callback message to report network types bitmask

     */

     */

    public void getAllowedNetworkTypesBitmask(Message response) {

    public void getAllowedNetworkTypesBitmask(Message response) {

        //TODO: Change to getAllowedNetworkTypesBitmap after 1.6 HAL ready.

        mCi.getAllowedNetworkTypesBitmap(response);

        mCi.getPreferredNetworkType(response);

    }

    }





    /**

    /**

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

+2 −5
Original line number Original line Diff line number Diff line
@@ -3543,11 +3543,8 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        IRadio radioProxy = getRadioProxy(result);

        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {

        if (radioProxy != null) {

            if (mRadioVersion.less(RADIO_HAL_VERSION_1_6)) {

            if (mRadioVersion.less(RADIO_HAL_VERSION_1_6)) {

                if (result != null) {

                // For older HAL, redirects the call to getPreferredNetworkType.

                    AsyncResult.forMessage(result, null,

                getPreferredNetworkType(result);

                            CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));

                    result.sendToTarget();

                }

                return;

                return;

            }

            }