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

2 files changed, 7 insertions, 15 deletions

diff --git a/java/com/android/dialer/simulator/SimulatorComponent.java b/java/com/android/dialer/simulator/SimulatorComponent.java
index a16592e34..f14496b80 100644
--- a/java/com/android/dialer/simulator/SimulatorComponent.java
+++ b/java/com/android/dialer/simulator/SimulatorComponent.java
@@ -17,26 +17,18 @@
 package com.android.dialer.simulator;
 
 import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
 import dagger.Subcomponent;
-import com.android.dialer.simulator.impl.SimulatorImpl;
 
 /** Subcomponent that can be used to access the simulator implementation. */
-public class SimulatorComponent {
-  private static SimulatorComponent instance;
-  private Simulator simulator;
+@Subcomponent
+public abstract class SimulatorComponent {
 
-  public Simulator getSimulator() {
-    if (simulator == null) {
-        simulator = new SimulatorImpl();
-    }
-    return simulator;
-  }
+  public abstract Simulator getSimulator();
 
   public static SimulatorComponent get(Context context) {
-    if (instance == null) {
-        instance = new SimulatorComponent();
-    }
-    return instance;
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .simulatorComponent();
   }
 
   /** Used to refer to the root application component. */
diff --git a/java/com/android/dialer/simulator/impl/SimulatorImpl.java b/java/com/android/dialer/simulator/impl/SimulatorImpl.java
index 9c6826940..2dd180ef4 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorImpl.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorImpl.java
@@ -24,7 +24,7 @@ import com.android.dialer.simulator.Simulator;
 import javax.inject.Inject;
 
 /** The entry point for the simulator feature. */
-final public class SimulatorImpl implements Simulator {
+final class SimulatorImpl implements Simulator {
   @Inject
   public SimulatorImpl() {}