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, 41 insertions, 0 deletions

diff --git a/java/com/android/dialer/app/calllog/PhoneAccountHandles.java b/java/com/android/dialer/app/calllog/PhoneAccountHandles.java
new file mode 100644
index 000000000..6d51b853c
--- /dev/null
+++ b/java/com/android/dialer/app/calllog/PhoneAccountHandles.java
@@ -0,0 +1,41 @@
+package com.android.dialer.app.calllog;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import com.android.dialer.app.calllog.CallLogNotificationsQueryHelper.NewCall;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.telecom.TelecomUtil;
+
+/** Methods to help extract {@link PhoneAccount} information from database and Telecomm sources. */
+class PhoneAccountHandles {
+
+  @Nullable
+  public static PhoneAccountHandle getAccount(@NonNull Context context, @Nullable NewCall call) {
+    PhoneAccountHandle handle;
+    if (call == null || call.accountComponentName == null || call.accountId == null) {
+      LogUtil.v(
+          "PhoneAccountUtils.getAccount",
+          "accountComponentName == null || callToNotify.accountId == null");
+      handle = TelecomUtil.getDefaultOutgoingPhoneAccount(context, PhoneAccount.SCHEME_TEL);
+      if (handle == null) {
+        return null;
+      }
+    } else {
+      handle =
+          new PhoneAccountHandle(
+              ComponentName.unflattenFromString(call.accountComponentName), call.accountId);
+    }
+    if (handle.getComponentName() != null) {
+      LogUtil.v(
+          "PhoneAccountUtils.getAccount",
+          "PhoneAccountHandle.ComponentInfo:" + handle.getComponentName());
+    } else {
+      LogUtil.i("PhoneAccountUtils.getAccount", "PhoneAccountHandle.ComponentInfo: null");
+    }
+    return handle;
+  }
+}