commit e34afe354109b5d2f00ee1d1e8763e1afcfd1317
author Nathan Harold <nharold@google.com> Wed Feb 20 14:00:07 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Feb 20 14:00:07 2019 -0800
tree e1015862ab8e9ad3b28facff97925883a185f691
parent 7b46efda19787fb2ebdca54181398ddf79cc6bf2
parent 5ea5f198c09f38de049749ac4744c4e3d1fc2fa5

Merge "Debug Event for Malformed PLMN ID in CellIdentity"
am: 5ea5f198c0

Change-Id: I369199cc54afc5e49cc267bba17437437c1261df

telephony/java/android/telephony/CellIdentity.java

diff --git a/telephony/java/android/telephony/CellIdentity.java b/telephony/java/android/telephony/CellIdentity.java
index 6958d22..7655834 100644
--- a/telephony/java/android/telephony/CellIdentity.java
+++ b/telephony/java/android/telephony/CellIdentity.java
@@ -23,6 +23,7 @@
 import android.text.TextUtils;
 
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * CellIdentity represents the identity of a unique cell. This is the base class for
@@ -83,6 +84,13 @@
             mMncStr = null;
             log("invalid MNC format: " + mnc);
         }
+
+        if ((mMccStr != null && mMncStr == null) || (mMccStr == null && mMncStr != null)) {
+            DebugEventReporter.sendEvent(
+                    UUID.fromString("a3ab0b9d-f2aa-4baf-911d-7096c0d4645a"),
+                    "CellIdentity Missing Half of PLMN ID");
+        }
+
         mAlphaLong = alphal;
         mAlphaShort = alphas;
     }