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

Commit f50d1ead authored by Cassie's avatar Cassie Committed by android-build-merger
Browse files

Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: b45f721d am: abf442e3 

am: ad8e3ec5

Change-Id: I47be76dd043e5d377122a6844de36f86068a0b02
parents 2e686ca1 ad8e3ec5

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

+16 −8
Original line number Diff line number Diff line
@@ -99,25 +99,33 @@ public class CellIdentityGsmTest extends AndroidTestCase { 


        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertEquals(null, ci.getMccStr());

        assertEquals(null, ci.getMncStr());

        assertEquals(null, ci.getMobileNetworkOperator());

        assertNull(ci.getMccStr());

        assertNull(ci.getMncStr());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityGsm(LAC, CID, ARFCN, BSIC, MCC_STR, null, ALPHA_LONG, ALPHA_SHORT);



        assertEquals(MCC, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(null, ci.getMncStr());

        assertEquals(null, ci.getMobileNetworkOperator());

        assertNull(ci.getMncStr());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityGsm(LAC, CID, ARFCN, BSIC, null, MNC_STR, ALPHA_LONG, ALPHA_SHORT);



        assertEquals(MNC, ci.getMnc());

        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(MNC_STR, ci.getMncStr());

        assertNull(ci.getMccStr());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityGsm(LAC, CID, ARFCN, BSIC, "", "", ALPHA_LONG, ALPHA_SHORT);



        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertEquals(null, ci.getMccStr());

        assertEquals(null, ci.getMncStr());

        assertEquals(null, ci.getMobileNetworkOperator());

        assertNull(ci.getMccStr());

        assertNull(ci.getMncStr());

        assertNull(ci.getMobileNetworkOperator());

    }



    @SmallTest

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

+16 −8
Original line number Diff line number Diff line
@@ -96,25 +96,33 @@ public class CellIdentityLteTest extends AndroidTestCase { 


        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertEquals(null, ci.getMccStr());

        assertEquals(null, ci.getMncStr());

        assertEquals(null, ci.getMobileNetworkOperator());

        assertNull(ci.getMccStr());

        assertNull(ci.getMncStr());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityLte(CI, PCI, TAC, EARFCN, MCC_STR, null, ALPHA_LONG, ALPHA_SHORT);



        assertEquals(MCC, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(null, ci.getMncStr());

        assertEquals(null, ci.getMobileNetworkOperator());

        assertNull(ci.getMncStr());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityLte(CI, PCI, TAC, EARFCN, null, MNC_STR, ALPHA_LONG, ALPHA_SHORT);



        assertEquals(MNC, ci.getMnc());

        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(MNC_STR, ci.getMncStr());

        assertNull(ci.getMccStr());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityLte(CI, PCI, TAC, EARFCN, "", "", ALPHA_LONG, ALPHA_SHORT);



        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertEquals(null, ci.getMccStr());

        assertEquals(null, ci.getMncStr());

        assertEquals(null, ci.getMobileNetworkOperator());

        assertNull(ci.getMccStr());

        assertNull(ci.getMncStr());

        assertNull(ci.getMobileNetworkOperator());

    }



    @SmallTest

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

+16 −8
Original line number Diff line number Diff line
@@ -96,25 +96,33 @@ public class CellIdentityWcdmaTest extends AndroidTestCase { 


        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertEquals(null, ci.getMccStr());

        assertEquals(null, ci.getMncStr());

        assertEquals(null, ci.getMobileNetworkOperator());

        assertNull(ci.getMccStr());

        assertNull(ci.getMncStr());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityWcdma(LAC, CID, PSC, UARFCN, MCC_STR, null, ALPHA_LONG, ALPHA_SHORT);



        assertEquals(MCC, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(null, ci.getMncStr());

        assertEquals(null, ci.getMobileNetworkOperator());

        assertNull(ci.getMncStr());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityWcdma(LAC, CID, PSC, UARFCN, null, MNC_STR, ALPHA_LONG, ALPHA_SHORT);



        assertEquals(MNC, ci.getMnc());

        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(MNC_STR, ci.getMncStr());

        assertNull(ci.getMccStr());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityWcdma(LAC, CID, PSC, UARFCN, "", "", ALPHA_LONG, ALPHA_SHORT);



        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertEquals(null, ci.getMccStr());

        assertEquals(null, ci.getMncStr());

        assertEquals(null, ci.getMobileNetworkOperator());

        assertNull(ci.getMccStr());

        assertNull(ci.getMncStr());

        assertNull(ci.getMobileNetworkOperator());

    }



    @SmallTest