Update Dialer source from latest green build.

* Refactor voicemail component
* Add new enriched calling components

Test: treehugger, manual aosp testing

Change-Id: I521a0f86327d4b42e14d93927c7d613044ed5942

1 files changed, 12 insertions, 2 deletions

diff --git a/java/com/android/dialer/constants/Constants.java b/java/com/android/dialer/constants/Constants.java
index 77773018a..d92c0bcfc 100644
--- a/java/com/android/dialer/constants/Constants.java
+++ b/java/com/android/dialer/constants/Constants.java
@@ -19,7 +19,6 @@ package com.android.dialer.constants;
 import android.support.annotation.NonNull;
 import com.android.dialer.common.Assert;
 import com.android.dialer.proguard.UsedByReflection;
-import com.android.dialer.constants.ConstantsImpl;
 
 /**
  * Utility to access constants that are different across build variants (Google Dialer, AOSP,
@@ -29,11 +28,22 @@ import com.android.dialer.constants.ConstantsImpl;
  */
 @UsedByReflection(value = "Constants.java")
 public abstract class Constants {
-  private static Constants instance = new ConstantsImpl();
+  private static Constants instance;
   private static boolean didInitializeInstance;
 
   @NonNull
   public static synchronized Constants get() {
+    if (!didInitializeInstance) {
+      didInitializeInstance = true;
+      try {
+        Class<?> clazz = Class.forName(Constants.class.getName() + "Impl");
+        instance = (Constants) clazz.getConstructor().newInstance();
+      } catch (ReflectiveOperationException e) {
+        Assert.fail(
+            "Unable to create an instance of ConstantsImpl. To fix this error include one of the "
+                + "constants modules (googledialer, aosp etc...) in your target.");
+      }
+    }
     return instance;
   }