Update AOSP Dialer source from internal google3 repository at
cl/150756069
Test: make, treehugger
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/150392808 (3/16/2017) to cl/150756069 (3/21/2017).
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Change-Id: I0888b5db52efb28eb8194600e0c7804592f975f3
diff --git a/java/com/android/voicemail/VoicemailComponent.java b/java/com/android/voicemail/VoicemailComponent.java
index 6dd6f9d..bed75f0 100644
--- a/java/com/android/voicemail/VoicemailComponent.java
+++ b/java/com/android/voicemail/VoicemailComponent.java
@@ -17,26 +17,18 @@
package com.android.voicemail;
import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
import dagger.Subcomponent;
-import com.android.voicemail.impl.VoicemailClientImpl;
/** Subcomponent that can be used to access the voicemail implementation. */
-public class VoicemailComponent {
- private static VoicemailComponent instance;
- private VoicemailClientImpl voicemailClient;
+@Subcomponent
+public abstract class VoicemailComponent {
- public VoicemailClient getVoicemailClient() {
- if (voicemailClient == null) {
- voicemailClient = new VoicemailClientImpl();
- }
- return voicemailClient;
- }
+ public abstract VoicemailClient getVoicemailClient();
public static VoicemailComponent get(Context context) {
- if (instance == null) {
- instance = new VoicemailComponent();
- }
- return instance;
+ return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+ .voicemailComponent();
}
/** Used to refer to the root application component. */