Merge changes I4bdadacc,Ie1f8da1a

* changes:
  Reworked the internals of DialerPhoneNumber.
  Implemented Post Call in NUI.

1 files changed, 3 insertions, 3 deletions

diff --git a/java/com/android/dialer/voicemail/listui/menu/Modules.java b/java/com/android/dialer/voicemail/listui/menu/Modules.java
index bd79932e7..665031a1f 100644
--- a/java/com/android/dialer/voicemail/listui/menu/Modules.java
+++ b/java/com/android/dialer/voicemail/listui/menu/Modules.java
@@ -43,8 +43,8 @@ final class Modules {
         voicemailEntry.numberAttributes().getName(),
         voicemailEntry.numberAttributes().getLookupUri());
 
-    String originalNumber = voicemailEntry.number().getRawInput().getNumber();
-    SharedModules.maybeAddModuleForSendingTextMessage(context, modules, originalNumber);
+    String normalizedNumber = voicemailEntry.number().getNormalizedNumber();
+    SharedModules.maybeAddModuleForSendingTextMessage(context, modules, normalizedNumber);
 
     if (!modules.isEmpty()) {
       modules.add(new DividerModule());
@@ -52,7 +52,7 @@ final class Modules {
 
     // TODO(zachh): Module for blocking/unblocking spam.
     // TODO(zachh): Module for CallComposer.
-    SharedModules.maybeAddModuleForCopyingNumber(context, modules, originalNumber);
+    SharedModules.maybeAddModuleForCopyingNumber(context, modules, normalizedNumber);
 
     return modules;
   }