commit e885c6acb4910e45c2313c9715aff137c5ca9357
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 02 23:59:26 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 02 23:59:26 2018 +0000
tree 9460ddcf009afb0b4a9b9c65119cf1388d289493
parent 056c1911137caad554cdfebb5a0b4a03e3df8c53
parent 668b99f9d6eca8f6d53432cc9ceddc914be7cfb3

Merge "Add assert check for INVALID NUMBERS in NUI Voicemail"

java/com/android/dialer/voicemail/listui/VoicemailCursorLoader.java

diff --git a/java/com/android/dialer/voicemail/listui/VoicemailCursorLoader.java b/java/com/android/dialer/voicemail/listui/VoicemailCursorLoader.java
index 7e03818..74d1b61 100644
--- a/java/com/android/dialer/voicemail/listui/VoicemailCursorLoader.java
+++ b/java/com/android/dialer/voicemail/listui/VoicemailCursorLoader.java
@@ -23,6 +23,8 @@
 import com.android.dialer.DialerPhoneNumber;
 import com.android.dialer.NumberAttributes;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.voicemail.model.VoicemailEntry;
 import com.google.protobuf.InvalidProtocolBufferException;
 
@@ -84,6 +86,13 @@
       throw new IllegalStateException("Couldn't parse NumberAttributes bytes");
     }
 
+    // Voicemail numbers should always be valid so the CP2 information should never be incomplete,
+    // and there should be no need to query PhoneLookup at render time.
+    Assert.checkArgument(
+        !numberAttributes.getIsCp2InfoIncomplete(),
+        "CP2 info incomplete for number: %s",
+        LogUtil.sanitizePii(number.getNormalizedNumber()));
+
     return VoicemailEntry.builder()
         .setId(cursor.getInt(ID))
         .setTimestamp(cursor.getLong(TIMESTAMP))