Merge "telephony: Fix CID when CID is unknown"

Author: Jean-Baptiste Queru

telephony/java/android/telephony/NeighboringCellInfo.java

@@ -133,8 +133,11 @@ public NeighboringCellInfo(int rssi, String location, int radioType) {
             case NETWORK_TYPE_GPRS:
             case NETWORK_TYPE_EDGE:
                 mNetworkType = radioType;
-                mLac = Integer.valueOf(location.substring(0, 4), 16);
-                mCid = Integer.valueOf(location.substring(4), 16);
+                // check if 0xFFFFFFFF for UNKNOWN_CID
+                if (!location.equalsIgnoreCase("FFFFFFFF")) {
+                    mCid = Integer.valueOf(location.substring(4), 16);
+                    mLac = Integer.valueOf(location.substring(0, 4), 16);
+                }
                 break;
             case NETWORK_TYPE_UMTS:
             case NETWORK_TYPE_HSDPA:
@@ -293,4 +296,4 @@ public NeighboringCellInfo[] newArray(int size) {
             return new NeighboringCellInfo[size];
         }
     };
-}
+}