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

Commit a072f7c3 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Use empty string instead of null in setAllowedCarriers" 

am: fe403e0c

Change-Id: I782275868d499b6919e1b4b573e8e8b5ad7b9819
parents 629c22b1 fe403e0c

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

+4 −4
Original line number Diff line number Diff line
@@ -3903,8 +3903,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())) {
@@ -3921,7 +3921,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);

            }