From 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Mon, 20 Mar 2017 08:50:25 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/150622237 Test: make, treehugger, on device testing. 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/150622237 (3/20/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: Id53e0e580a4ef73760a8afb7bb8c265ee27ad535 --- java/com/android/incallui/maps/MapsComponent.java | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'java/com/android/incallui/maps/MapsComponent.java') diff --git a/java/com/android/incallui/maps/MapsComponent.java b/java/com/android/incallui/maps/MapsComponent.java index 1ca17b781..796abaa92 100644 --- a/java/com/android/incallui/maps/MapsComponent.java +++ b/java/com/android/incallui/maps/MapsComponent.java @@ -19,29 +19,18 @@ package com.android.incallui.maps; import android.content.Context; import com.android.dialer.inject.HasRootComponent; import dagger.Subcomponent; -import com.android.incallui.maps.stub.StubMapsModule; /** Subcomponent that can be used to access the maps implementation. */ -public class MapsComponent { +@Subcomponent +public abstract class MapsComponent { - private static MapsComponent instance; - private Maps maps; - - public Maps getMaps() { - if (maps == null) { - maps = new StubMapsModule.StubMaps(); - } - return maps; - } + public abstract Maps getMaps(); public static MapsComponent get(Context context) { - if (instance == null) { - instance = new MapsComponent(); - } - return instance; + return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component()) + .mapsComponent(); } - /** Used to refer to the root application component. */ public interface HasComponent { MapsComponent mapsComponent(); -- cgit v1.2.3