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

Commit c5b8de5c authored by Nathan Harold's avatar Nathan Harold Committed by Gerrit Code Review
Browse files

Merge "Migrate CellIdentity.TYPE_ to CellInfo.TYPE_"

parents 184369d5 a43271f3

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

+4 −5
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ import android.os.SystemProperties; 
import android.os.WorkSource;

import android.service.carrier.CarrierIdentifier;

import android.telephony.AccessNetworkConstants.AccessNetworkType;

import android.telephony.CellIdentity;

import android.telephony.CellIdentityCdma;

import android.telephony.CellInfo;

import android.telephony.CellSignalStrengthCdma;
@@ -5212,7 +5211,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    private static void writeToParcelForGsm(

            Parcel p, int lac, int cid, int arfcn, int bsic, String mcc, String mnc,

            String al, String as, int ss, int ber, int ta) {

        p.writeInt(CellIdentity.TYPE_GSM);

        p.writeInt(CellInfo.TYPE_GSM);

        p.writeString(mcc);

        p.writeString(mnc);

        p.writeString(al);
@@ -5236,7 +5235,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    private static void writeToParcelForLte(

            Parcel p, int ci, int pci, int tac, int earfcn, int bandwidth, String mcc, String mnc,

            String al, String as, int ss, int rsrp, int rsrq, int rssnr, int cqi, int ta) {

        p.writeInt(CellIdentity.TYPE_LTE);

        p.writeInt(CellInfo.TYPE_LTE);

        p.writeString(mcc);

        p.writeString(mnc);

        p.writeString(al);
@@ -5257,7 +5256,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    private static void writeToParcelForWcdma(

            Parcel p, int lac, int cid, int psc, int uarfcn, String mcc, String mnc,

            String al, String as, int ss, int ber, int rscp, int ecno) {

        p.writeInt(CellIdentity.TYPE_WCDMA);

        p.writeInt(CellInfo.TYPE_WCDMA);

        p.writeString(mcc);

        p.writeString(mnc);

        p.writeString(al);
@@ -5275,7 +5274,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    private static void writeToParcelForTdscdma(

            Parcel p, int lac, int cid, int cpid, int uarfcn, String mcc, String mnc,

            String al, String as, int ss, int ber, int rscp) {

        p.writeInt(CellIdentity.TYPE_TDSCDMA);

        p.writeInt(CellInfo.TYPE_TDSCDMA);

        p.writeString(mcc);

        p.writeString(mnc);

        p.writeString(al);

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

+3 −3
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.internal.telephony;



import android.os.Parcel;

import android.telephony.CellIdentity;

import android.telephony.CellIdentityGsm;

import android.telephony.CellInfo;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;
@@ -185,7 +185,7 @@ public class CellIdentityGsmTest extends AndroidTestCase { 
                new CellIdentityGsm(LAC, CID, ARFCN, BSIC, null, null, ALPHA_LONG, ALPHA_SHORT);



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentityGsm.TYPE_GSM);

        p.writeInt(CellInfo.TYPE_GSM);

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

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

        p.writeString(ALPHA_LONG);
@@ -208,7 +208,7 @@ public class CellIdentityGsmTest extends AndroidTestCase { 
                new CellIdentityGsm(LAC, CID, ARFCN, BSIC, null, null, ALPHA_LONG, ALPHA_SHORT);



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentity.TYPE_GSM);

        p.writeInt(CellInfo.TYPE_GSM);

        p.writeString(invalidMcc);

        p.writeString(invalidMnc);

        p.writeString(ALPHA_LONG);

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

+3 −3
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.internal.telephony;



import android.os.Parcel;

import android.telephony.CellIdentity;

import android.telephony.CellIdentityLte;

import android.telephony.CellInfo;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;
@@ -193,7 +193,7 @@ public class CellIdentityLteTest extends AndroidTestCase { 
                CI, PCI, TAC, EARFCN, BANDWIDTH, null, null, ALPHA_LONG, ALPHA_SHORT);



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentity.TYPE_LTE);

        p.writeInt(CellInfo.TYPE_LTE);

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

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

        p.writeString(ALPHA_LONG);
@@ -217,7 +217,7 @@ public class CellIdentityLteTest extends AndroidTestCase { 
                CI, PCI, TAC, EARFCN, BANDWIDTH, null, null, ALPHA_LONG, ALPHA_SHORT);



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentity.TYPE_LTE);

        p.writeInt(CellInfo.TYPE_LTE);

        p.writeString(invalidMcc);

        p.writeString(invalidMnc);

        p.writeString(ALPHA_LONG);

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

+3 −3
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.internal.telephony;



import android.os.Parcel;

import android.telephony.CellIdentity;

import android.telephony.CellIdentityTdscdma;

import android.telephony.CellInfo;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;
@@ -109,7 +109,7 @@ public class CellIdentityTdscdmaTest extends AndroidTestCase { 
                        null, null, LAC, CID, CPID, UARFCN, ALPHA_LONG, ALPHA_SHORT);



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentity.TYPE_TDSCDMA);

        p.writeInt(CellInfo.TYPE_TDSCDMA);

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

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

        p.writeString(ALPHA_LONG);
@@ -133,7 +133,7 @@ public class CellIdentityTdscdmaTest extends AndroidTestCase { 
                        null, null, LAC, CID, CPID, UARFCN, ALPHA_LONG, ALPHA_SHORT);



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentity.TYPE_TDSCDMA);

        p.writeInt(CellInfo.TYPE_TDSCDMA);

        p.writeString(invalidMcc);

        p.writeString(invalidMnc);

        p.writeString(ALPHA_LONG);

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

+3 −3
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.internal.telephony;



import android.os.Parcel;

import android.telephony.CellIdentity;

import android.telephony.CellIdentityWcdma;

import android.telephony.CellInfo;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;
@@ -183,7 +183,7 @@ public class CellIdentityWcdmaTest extends AndroidTestCase { 
                new CellIdentityWcdma(LAC, CID, PSC, UARFCN, null, null, ALPHA_LONG, ALPHA_SHORT);



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentity.TYPE_WCDMA);

        p.writeInt(CellInfo.TYPE_WCDMA);

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

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

        p.writeString(ALPHA_LONG);
@@ -206,7 +206,7 @@ public class CellIdentityWcdmaTest extends AndroidTestCase { 
                new CellIdentityWcdma(LAC, CID, PSC, UARFCN, null, null, ALPHA_LONG, ALPHA_SHORT);



        Parcel p = Parcel.obtain();

        p.writeInt(CellIdentity.TYPE_WCDMA);

        p.writeInt(CellInfo.TYPE_WCDMA);

        p.writeString(invalidMcc);

        p.writeString(invalidMnc);

        p.writeString(ALPHA_LONG);