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

Commit 2f7820ca authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Using getAllowedNetworkTypesBitmap after HAL1.6" am: 6d894a4d 

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

Change-Id: Ia5287776f6d3b1a52a2785ceb0fd40cf44fc97fc
parents 623ef8e7 6d894a4d

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

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

     */

    public void getAllowedNetworkTypesBitmask(Message response) {

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

        mCi.getPreferredNetworkType(response);

        mCi.getAllowedNetworkTypesBitmap(response);

    }



    /**

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

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

        if (radioProxy != null) {

            if (mRadioVersion.less(RADIO_HAL_VERSION_1_6)) {

                if (result != null) {

                    AsyncResult.forMessage(result, null,

                            CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));

                    result.sendToTarget();

                }

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

                getPreferredNetworkType(result);

                return;

            }