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

Commit 127bb13a authored by Michele Berionne's avatar Michele Berionne Committed by android-build-merger
Browse files

Merge "Rename isCarrierIdentifiersAllowed into areCarrierIdentifiersAllowed."... 

Merge "Rename isCarrierIdentifiersAllowed into areCarrierIdentifiersAllowed." am: d1bee509 am: 443f0f5a
am: b7239abd

Change-Id: Ia23c984566a0f9b7972e137a42662b755a7f4d9b
parents 7da49eda b7239abd

tests/telephonytests/src/com/android/internal/telephony/CarrierRestrictionRulesTest.java

+5 −5
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ public class CarrierRestrictionRulesTest extends AndroidTestCase { 
        list.add(new CarrierIdentifier(MCC4, MNC4, null, null, null, null));

        list.add(new CarrierIdentifier(MCC5, MNC5, null, null, null, null));



        List<Boolean> result = rules.isCarrierIdentifiersAllowed(list);

        List<Boolean> result = rules.areCarrierIdentifiersAllowed(list);



        List<Boolean> expected =

                Arrays.asList(true, true, true, true, true, true, true, true, true, true, true);
@@ -247,7 +247,7 @@ public class CarrierRestrictionRulesTest extends AndroidTestCase { 
        list.add(new CarrierIdentifier(MCC4, MNC4, null, null, null, null));

        list.add(new CarrierIdentifier(MCC5, MNC5, null, null, null, null));



        List<Boolean> result = rules.isCarrierIdentifiersAllowed(list);

        List<Boolean> result = rules.areCarrierIdentifiersAllowed(list);



        List<Boolean> expected =

                Arrays.asList(true, true, true, true, true, true, true,
@@ -282,7 +282,7 @@ public class CarrierRestrictionRulesTest extends AndroidTestCase { 
        list.add(new CarrierIdentifier(MCC1, MNC3, null, null, null, null));

        list.add(new CarrierIdentifier(MCC1, MNC4, null, null, null, null));



        List<Boolean> result = rules.isCarrierIdentifiersAllowed(list);

        List<Boolean> result = rules.areCarrierIdentifiersAllowed(list);



        List<Boolean> expected = Arrays.asList(true, true, true, true, false, false);

        assertTrue(result.equals(expected));
@@ -309,7 +309,7 @@ public class CarrierRestrictionRulesTest extends AndroidTestCase { 
        list.add(new CarrierIdentifier(MCC4, MNC4, null, null, null, null));

        list.add(new CarrierIdentifier(MCC5, MNC5, null, null, null, null));



        List<Boolean> result = rules.isCarrierIdentifiersAllowed(list);

        List<Boolean> result = rules.areCarrierIdentifiersAllowed(list);



        List<Boolean> expected = Arrays.asList(true, true, true, true);

        assertTrue(result.equals(expected));
@@ -335,7 +335,7 @@ public class CarrierRestrictionRulesTest extends AndroidTestCase { 
        list.add(new CarrierIdentifier(MCC4, MNC4, null, null, null, null));

        list.add(new CarrierIdentifier(MCC5, MNC5, null, null, null, null));



        List<Boolean> result = rules.isCarrierIdentifiersAllowed(list);

        List<Boolean> result = rules.areCarrierIdentifiersAllowed(list);



        List<Boolean> expected = Arrays.asList(false, false, false);

        assertTrue(result.equals(expected));