Update Dialer source from latest green build.

* Refactor voicemail component
* Add new enriched calling components

Test: treehugger, manual aosp testing

Change-Id: I521a0f86327d4b42e14d93927c7d613044ed5942

2 files changed, 15 insertions, 19 deletions

diff --git a/java/com/android/dialer/inject/ApplicationModule.java b/java/com/android/dialer/inject/ContextModule.java
index 99e5296ea..aa83f0105 100644
--- a/java/com/android/dialer/inject/ApplicationModule.java
+++ b/java/com/android/dialer/inject/ContextModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,24 +16,24 @@
 
 package com.android.dialer.inject;
 
-import android.app.Application;
+import android.content.Context;
 import android.support.annotation.NonNull;
 import com.android.dialer.common.Assert;
 import dagger.Module;
 import dagger.Provides;
 
-/** Provides the singleton application object. */
+/** Provides the singleton context object. */
 @Module
-public final class ApplicationModule {
+public final class ContextModule {
 
-  @NonNull private final Application application;
+  @NonNull private final Context context;
 
-  public ApplicationModule(@NonNull Application application) {
-    this.application = Assert.isNotNull(application);
+  public ContextModule(@NonNull Context context) {
+    this.context = Assert.isNotNull(context);
   }
 
   @Provides
-  Application provideApplication() {
-    return application;
+  Context provideContext() {
+    return context;
   }
 }
diff --git a/java/com/android/dialer/inject/DialerAppComponent.java b/java/com/android/dialer/inject/HasRootComponent.java
index 9832ce804..0802b806a 100644
--- a/java/com/android/dialer/inject/DialerAppComponent.java
+++ b/java/com/android/dialer/inject/HasRootComponent.java
@@ -16,14 +16,10 @@
 
 package com.android.dialer.inject;
 
-import com.android.dialer.enrichedcall.EnrichedCallManager;
-import com.android.dialer.enrichedcall.StubEnrichedCallModule;
-import dagger.Component;
-import javax.inject.Singleton;
-
-/** Core application-wide {@link Component} for the open source dialer app. */
-@Singleton
-@Component(modules = {ApplicationModule.class, StubEnrichedCallModule.class})
-public interface DialerAppComponent {
-  EnrichedCallManager enrichedCallManager();
+/**
+ * Used by packages to access the root component from the Application without creating a dependency
+ * cycle.
+ */
+public interface HasRootComponent {
+  Object component();
 }