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

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

Merge "Move alpha long/short to the base CellIdentity according API Review." 

am: ba9e6071

Change-Id: I268622512927598b97d882d2d61efccb070fd4e4
parents ce940691 ba9e6071

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

+6 −6
Original line number Diff line number Diff line
@@ -5115,12 +5115,12 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        p.writeInt(CellIdentity.TYPE_GSM);

        p.writeString(mcc);

        p.writeString(mnc);

        p.writeString(al);

        p.writeString(as);

        p.writeInt(lac);

        p.writeInt(cid);

        p.writeInt(arfcn);

        p.writeInt(bsic);

        p.writeString(al);

        p.writeString(as);

        p.writeInt(ss);

        p.writeInt(ber);

        p.writeInt(ta);
@@ -5139,13 +5139,13 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        p.writeInt(CellIdentity.TYPE_LTE);

        p.writeString(mcc);

        p.writeString(mnc);

        p.writeString(al);

        p.writeString(as);

        p.writeInt(ci);

        p.writeInt(pci);

        p.writeInt(tac);

        p.writeInt(earfcn);

        p.writeInt(bandwidth);

        p.writeString(al);

        p.writeString(as);

        p.writeInt(ss);

        p.writeInt(rsrp);

        p.writeInt(rsrq);
@@ -5160,12 +5160,12 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        p.writeInt(CellIdentity.TYPE_WCDMA);

        p.writeString(mcc);

        p.writeString(mnc);

        p.writeString(al);

        p.writeString(as);

        p.writeInt(lac);

        p.writeInt(cid);

        p.writeInt(psc);

        p.writeInt(uarfcn);

        p.writeString(al);

        p.writeString(as);

        p.writeInt(ss);

        p.writeInt(ber);

    }

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

+8 −2
Original line number Diff line number Diff line
@@ -181,12 +181,15 @@ public class CellIdentityGsmTest extends AndroidTestCase { 


    @SmallTest

    public void testParcelWithUnknowMccMnc() {

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

        CellIdentityGsm ci =

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



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentityGsm.TYPE_GSM);

        p.writeString(String.valueOf(Integer.MAX_VALUE));

        p.writeString(String.valueOf(Integer.MAX_VALUE));

        p.writeString(ALPHA_LONG);

        p.writeString(ALPHA_SHORT);

        p.writeInt(LAC);

        p.writeInt(CID);

        p.writeInt(ARFCN);
@@ -201,12 +204,15 @@ public class CellIdentityGsmTest extends AndroidTestCase { 
    public void testParcelWithInvalidMccMnc() {

        final String invalidMcc = "randomStuff";

        final String invalidMnc = "randomStuff";

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

        CellIdentityGsm ci =

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



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentity.TYPE_GSM);

        p.writeString(invalidMcc);

        p.writeString(invalidMnc);

        p.writeString(ALPHA_LONG);

        p.writeString(ALPHA_SHORT);

        p.writeInt(LAC);

        p.writeInt(CID);

        p.writeInt(ARFCN);

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

+6 −2
Original line number Diff line number Diff line
@@ -190,12 +190,14 @@ public class CellIdentityLteTest extends AndroidTestCase { 
    @SmallTest

    public void testParcelWithUnknownMccMnc() {

        CellIdentityLte ci = new CellIdentityLte(

                CI, PCI, TAC, EARFCN, BANDWIDTH, null, null, null, null);

                CI, PCI, TAC, EARFCN, BANDWIDTH, null, null, ALPHA_LONG, ALPHA_SHORT);



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentity.TYPE_LTE);

        p.writeString(String.valueOf(Integer.MAX_VALUE));

        p.writeString(String.valueOf(Integer.MAX_VALUE));

        p.writeString(ALPHA_LONG);

        p.writeString(ALPHA_SHORT);

        p.writeInt(CI);

        p.writeInt(PCI);

        p.writeInt(TAC);
@@ -212,12 +214,14 @@ public class CellIdentityLteTest extends AndroidTestCase { 
        final String invalidMcc = "randomStuff";

        final String invalidMnc = "randomStuff";

        CellIdentityLte ci = new CellIdentityLte(

                CI, PCI, TAC, EARFCN, BANDWIDTH, null, null, null, null);

                CI, PCI, TAC, EARFCN, BANDWIDTH, null, null, ALPHA_LONG, ALPHA_SHORT);



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentity.TYPE_LTE);

        p.writeString(invalidMcc);

        p.writeString(invalidMnc);

        p.writeString(ALPHA_LONG);

        p.writeString(ALPHA_SHORT);

        p.writeInt(CI);

        p.writeInt(PCI);

        p.writeInt(TAC);

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

+8 −2
Original line number Diff line number Diff line
@@ -98,12 +98,15 @@ public class CellIdentityTdscdmaTest extends AndroidTestCase { 


    @SmallTest

    public void testParcelWithUnknowMccMnc() {

        CellIdentityTdscdma ci = new CellIdentityTdscdma(null, null, LAC, CID, CPID);

        CellIdentityTdscdma ci =

                new CellIdentityTdscdma(null, null, LAC, CID, CPID, ALPHA_LONG, ALPHA_SHORT);



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentity.TYPE_TDSCDMA);

        p.writeString(String.valueOf(Integer.MAX_VALUE));

        p.writeString(String.valueOf(Integer.MAX_VALUE));

        p.writeString(ALPHA_LONG);

        p.writeString(ALPHA_SHORT);

        p.writeInt(LAC);

        p.writeInt(CID);

        p.writeInt(CPID);
@@ -117,12 +120,15 @@ public class CellIdentityTdscdmaTest extends AndroidTestCase { 
    public void testParcelWithInvalidMccMnc() {

        final String invalidMcc = "randomStuff";

        final String invalidMnc = "randomStuff";

        CellIdentityTdscdma ci = new CellIdentityTdscdma(null, null, LAC, CID, CPID);

        CellIdentityTdscdma ci =

                new CellIdentityTdscdma(null, null, LAC, CID, CPID, ALPHA_LONG, ALPHA_SHORT);



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentity.TYPE_TDSCDMA);

        p.writeString(invalidMcc);

        p.writeString(invalidMnc);

        p.writeString(ALPHA_LONG);

        p.writeString(ALPHA_SHORT);

        p.writeInt(LAC);

        p.writeInt(CID);

        p.writeInt(CPID);

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

+8 −2
Original line number Diff line number Diff line
@@ -179,12 +179,15 @@ public class CellIdentityWcdmaTest extends AndroidTestCase { 


    @SmallTest

    public void testParcelWithUnknowMccMnc() {

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

        CellIdentityWcdma ci =

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



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentity.TYPE_WCDMA);

        p.writeString(String.valueOf(Integer.MAX_VALUE));

        p.writeString(String.valueOf(Integer.MAX_VALUE));

        p.writeString(ALPHA_LONG);

        p.writeString(ALPHA_SHORT);

        p.writeInt(LAC);

        p.writeInt(CID);

        p.writeInt(PSC);
@@ -199,12 +202,15 @@ public class CellIdentityWcdmaTest extends AndroidTestCase { 
    public void testParcelWithInvalidMccMnc() {

        final String invalidMcc = "randomStuff";

        final String invalidMnc = "randomStuff";

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

        CellIdentityWcdma ci =

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



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentity.TYPE_WCDMA);

        p.writeString(invalidMcc);

        p.writeString(invalidMnc);

        p.writeString(ALPHA_LONG);

        p.writeString(ALPHA_SHORT);

        p.writeInt(LAC);

        p.writeInt(CID);

        p.writeInt(PSC);