Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: If15506ea8248ae9a4176dcfd6dc8c94ebbad6f57
This commit is contained in:
Nathan Harold
2020-04-25 03:57:27 +00:00
committed by Automerger Merge Worker
parent a794e9eade 6f918dbf7c
commit 47cb68cc69
6 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
telephony/java/android/telephony/CellIdentityCdma.java
View File

@@ -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());
} }

1
telephony/java/android/telephony/CellIdentityGsm.java
View File

@@ -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());
} }

2
telephony/java/android/telephony/CellIdentityLte.java
View File

@@ -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());
} }

2
telephony/java/android/telephony/CellIdentityNr.java
View File

@@ -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 */

2
telephony/java/android/telephony/CellIdentityTdscdma.java
View File

@@ -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());
} }

2
telephony/java/android/telephony/CellIdentityWcdma.java
View File

@@ -336,6 +336,8 @@ public final class CellIdentityWcdma 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());
} }