Merge changes from topic "pick-sst-location-iwlan" am: 19e83aca9d

Change-Id: I9793f00bd2d8a45bef7d1c1ea67ca046b133aba4

telephony/java/android/telephony/CellIdentityCdma.java

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

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

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

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

telephony/java/android/telephony/CellIdentityTdscdma.java

@@ -321,6 +321,8 @@ public final class CellIdentityTdscdma extends CellIdentity {
         mUarfcn = in.readInt();
         mAdditionalPlmns = (ArraySet<String>) in.readArraySet(null);
         mCsgInfo = in.readParcelable(null);
+
+        updateGlobalCellId();
         if (DBG) log(toString());
     }
 

telephony/java/android/telephony/CellIdentityWcdma.java

@@ -336,6 +336,8 @@ public final class CellIdentityWcdma extends CellIdentity {
         mUarfcn = in.readInt();
         mAdditionalPlmns = (ArraySet<String>) in.readArraySet(null);
         mCsgInfo = in.readParcelable(null);
+
+        updateGlobalCellId();
         if (DBG) log(toString());
     }