commit 5ea5f198c09f38de049749ac4744c4e3d1fc2fa5
author Nathan Harold <nharold@google.com> Wed Feb 20 21:08:05 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 20 21:08:05 2019 +0000
tree 55241af3876d40130cf2a76838c6562e567e429f
parent 609ea873b76caa7625491f361d913b9cddab6da5
parent adcb75d38bd6b1906c6c77d8e627bd9f48fb41ec

Merge "Debug Event for Malformed PLMN ID in CellIdentity"

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;
     }