Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev

2016-05-06 03:22:21 +00:00
parent 5b45c62a1a a326a4827e
commit 08acd3ce28
1 changed files with 6 additions and 1 deletions
--- a/telephony/java/android/telephony/CellIdentityGsm.java
+++ b/telephony/java/android/telephony/CellIdentityGsm.java
@@ -216,7 +216,12 @@ public final class CellIdentityGsm implements Parcelable {
        mLac = in.readInt();
        mCid = in.readInt();
        mArfcn = in.readInt();
-        mBsic = in.readInt();
+        int bsic = in.readInt();
+        // In RIL BSIC is a UINT8, so 0xFF is the 'INVALID' designator
+        // for inbound parcels
+        if (bsic == 0xFF) bsic = Integer.MAX_VALUE;
+        mBsic = bsic;
+
        if (DBG) log("CellIdentityGsm(Parcel): " + toString());
    }