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

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

Merge "The AllowedNetworkTypes doesn't convert to hal's RadioAccessFamily" am:... 

Merge "The AllowedNetworkTypes doesn't convert to hal's RadioAccessFamily" am: ab604a06 am: f521ac9c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff3087660a1566918de97f920fc4ba93b3fc3074
parents 136e5809 f521ac9c

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

+2 −1
Original line number Diff line number Diff line
@@ -3529,7 +3529,8 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            }

            mAllowedNetworkTypesBitmask = networkTypeBitmask;

            try {

                radioProxy16.setAllowedNetworkTypesBitmap(rr.mSerial, networkTypeBitmask);

                radioProxy16.setAllowedNetworkTypesBitmap(rr.mSerial,

                        convertToHalRadioAccessFamily(mAllowedNetworkTypesBitmask));

            } catch (RemoteException | RuntimeException e) {

                handleRadioProxyExceptionForRR(rr, "setAllowedNetworkTypeBitmask", e);

            }