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

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

Merge changes from topic "pick-sst-location-iwlan" 

* changes:
  Update GlobalCellId during Un-parceling
  Make CellIdentity#getPlmn() Publicly Accessible
parents da8f7afd 9ced05a8

telephony/java/android/telephony/CellIdentity.java

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ public abstract class CellIdentity implements Parcelable { 
    }



    /** @hide */

    protected String getPlmn() {

    public @Nullable String getPlmn() {

        if (mMccStr == null || mMncStr == null) return null;

        return mMccStr + mMncStr;

    }

telephony/java/android/telephony/CellIdentityCdma.java

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

        mLatitude = in.readInt();



        updateGlobalCellId();

        if (DBG) log(toString());

    }

telephony/java/android/telephony/CellIdentityGsm.java

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

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



        updateGlobalCellId();

        if (DBG) log(toString());

    }

telephony/java/android/telephony/CellIdentityLte.java

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

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

        mCsgInfo = in.readParcelable(null);



        updateGlobalCellId();

        if (DBG) log(toString());

    }

telephony/java/android/telephony/CellIdentityNr.java

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

        mNci = in.readLong();

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



        updateGlobalCellId();

    }



    /** Implement the Parcelable interface */