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

Commit a0804342 authored by Nathan Harold's avatar Nathan Harold Committed by Automerger Merge Worker
Browse files

Merge "Update GlobalCellId during Un-parceling" into rvc-dev am: 6f918dbf... 

Merge "Update GlobalCellId during Un-parceling" into rvc-dev am: 6f918dbf am: 47cb68cc am: d90250e2 am: 15c50aba

Change-Id: If233f751ca8af55adaaaecd6490907a2c263ace4
parents 95f07343 15c50aba

telephony/java/android/telephony/CellIdentityCdma.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -279,6 +279,7 @@ public final class CellIdentityCdma extends CellIdentity { 
        mLongitude = in.readInt();

        mLongitude = in.readInt();

        mLatitude = in.readInt();

        mLatitude = in.readInt();





        updateGlobalCellId();

        if (DBG) log(toString());

        if (DBG) log(toString());

    }

    }

telephony/java/android/telephony/CellIdentityGsm.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -323,6 +323,7 @@ public final class CellIdentityGsm extends CellIdentity { 
        mBsic = in.readInt();

        mBsic = in.readInt();

        mAdditionalPlmns = (ArraySet<String>) in.readArraySet(null);

        mAdditionalPlmns = (ArraySet<String>) in.readArraySet(null);





        updateGlobalCellId();

        if (DBG) log(toString());

        if (DBG) log(toString());

    }

    }

telephony/java/android/telephony/CellIdentityLte.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -403,6 +403,8 @@ public final class CellIdentityLte extends CellIdentity { 
        mBandwidth = in.readInt();

        mBandwidth = in.readInt();

        mAdditionalPlmns = (ArraySet<String>) in.readArraySet(null);

        mAdditionalPlmns = (ArraySet<String>) in.readArraySet(null);

        mCsgInfo = in.readParcelable(null);

        mCsgInfo = in.readParcelable(null);



        updateGlobalCellId();

        if (DBG) log(toString());

        if (DBG) log(toString());

    }

    }

telephony/java/android/telephony/CellIdentityNr.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -273,6 +273,8 @@ public final class CellIdentityNr extends CellIdentity { 
        mBands = in.createIntArray();

        mBands = in.createIntArray();

        mNci = in.readLong();

        mNci = in.readLong();

        mAdditionalPlmns = (ArraySet<String>) in.readArraySet(null);

        mAdditionalPlmns = (ArraySet<String>) in.readArraySet(null);



        updateGlobalCellId();

    }

    }





    /** Implement the Parcelable interface */

    /** Implement the Parcelable interface */

telephony/java/android/telephony/CellIdentityTdscdma.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -321,6 +321,8 @@ public final class CellIdentityTdscdma extends CellIdentity { 
        mUarfcn = in.readInt();

        mUarfcn = in.readInt();

        mAdditionalPlmns = (ArraySet<String>) in.readArraySet(null);

        mAdditionalPlmns = (ArraySet<String>) in.readArraySet(null);

        mCsgInfo = in.readParcelable(null);

        mCsgInfo = in.readParcelable(null);



        updateGlobalCellId();

        if (DBG) log(toString());

        if (DBG) log(toString());

    }

    }