Update AOSP Dialer source from internal google3 repository at

cl/158012278.

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/152373142 (4/06/2017) to cl/158012278 (6/05/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: I4d3f14b5140e2e51bead9497bc118a205b3ebe76

2 files changed, 0 insertions, 47 deletions

diff --git a/java/com/android/incallui/bindings/InCallUiBindings.java b/java/com/android/incallui/bindings/InCallUiBindings.java
index d3d3a8b37..5c6aef4be 100644
--- a/java/com/android/incallui/bindings/InCallUiBindings.java
+++ b/java/com/android/incallui/bindings/InCallUiBindings.java
@@ -19,7 +19,6 @@ package com.android.incallui.bindings;
 import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.Nullable;
-import com.android.dialer.common.ConfigProvider;
 
 /** This interface allows the container application to customize the in call UI. */
 public interface InCallUiBindings {
@@ -37,12 +36,4 @@ public interface InCallUiBindings {
    */
   @Nullable
   Intent getCallStateButtonBroadcastIntent(Context context);
-
-  @Nullable
-  DistanceHelper newDistanceHelper(Context context, DistanceHelper.Listener listener);
-
-  @Nullable
-  ContactUtils getContactUtilsInstance(Context context);
-
-  ConfigProvider getConfigProvider();
 }
diff --git a/java/com/android/incallui/bindings/InCallUiBindingsStub.java b/java/com/android/incallui/bindings/InCallUiBindingsStub.java
index 7b42fb375..3a005b0fb 100644
--- a/java/com/android/incallui/bindings/InCallUiBindingsStub.java
+++ b/java/com/android/incallui/bindings/InCallUiBindingsStub.java
@@ -19,11 +19,9 @@ package com.android.incallui.bindings;
 import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.Nullable;
-import com.android.dialer.common.ConfigProvider;
 
 /** Default implementation for InCallUi bindings. */
 public class InCallUiBindingsStub implements InCallUiBindings {
-  private ConfigProvider configProvider;
 
   @Override
   @Nullable
@@ -42,40 +40,4 @@ public class InCallUiBindingsStub implements InCallUiBindings {
   public Intent getCallStateButtonBroadcastIntent(Context context) {
     return null;
   }
-
-  @Override
-  @Nullable
-  public DistanceHelper newDistanceHelper(Context context, DistanceHelper.Listener listener) {
-    return null;
-  }
-
-  @Override
-  @Nullable
-  public ContactUtils getContactUtilsInstance(Context context) {
-    return null;
-  }
-
-  @Override
-  public ConfigProvider getConfigProvider() {
-    if (configProvider == null) {
-      configProvider =
-          new ConfigProvider() {
-            @Override
-            public String getString(String key, String defaultValue) {
-              return defaultValue;
-            }
-
-            @Override
-            public long getLong(String key, long defaultValue) {
-              return defaultValue;
-            }
-
-            @Override
-            public boolean getBoolean(String key, boolean defaultValue) {
-              return defaultValue;
-            }
-          };
-    }
-    return configProvider;
-  }
 }