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

Commit fe403e0c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use empty string instead of null in setAllowedCarriers"

parents b2f4e090 9f18938b

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

+4 −4
Original line number Diff line number Diff line
@@ -3904,8 +3904,8 @@ public final class RIL extends BaseCommands implements CommandsInterface { 


            for (CarrierIdentifier ci : carriers) { /* allowed carriers */

                Carrier c = new Carrier();

                c.mcc = ci.getMcc();

                c.mnc = ci.getMnc();

                c.mcc = convertNullToEmptyString(ci.getMcc());

                c.mnc = convertNullToEmptyString(ci.getMnc());

                int matchType = CarrierIdentifier.MatchType.ALL;

                String matchData = null;

                if (!TextUtils.isEmpty(ci.getSpn())) {
@@ -3922,7 +3922,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
                    matchData = ci.getGid2();

                }

                c.matchType = matchType;

                c.matchData = matchData;

                c.matchData = convertNullToEmptyString(matchData);

                carrierList.allowedCarriers.add(c);

            }