Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47"

This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44.

Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master.

Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b

1 files changed, 2 insertions, 27 deletions

diff --git a/java/com/android/dialer/app/calllog/CallLogFragment.java b/java/com/android/dialer/app/calllog/CallLogFragment.java
index 1571c1aef..6e4b23fc1 100644
--- a/java/com/android/dialer/app/calllog/CallLogFragment.java
+++ b/java/com/android/dialer/app/calllog/CallLogFragment.java
@@ -49,16 +49,15 @@ import com.android.dialer.app.contactinfo.ContactInfoCache.OnContactInfoChangedL
 import com.android.dialer.app.contactinfo.ExpirableCacheHeadlessFragment;
 import com.android.dialer.app.list.ListsFragment;
 import com.android.dialer.app.voicemail.VoicemailPlaybackPresenter;
+import com.android.dialer.app.widget.EmptyContentView;
+import com.android.dialer.app.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.database.CallLogQueryHandler;
 import com.android.dialer.location.GeoUtil;
-import com.android.dialer.oem.CequintCallerIdManager;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
 import com.android.dialer.util.PermissionsUtil;
-import com.android.dialer.widget.EmptyContentView;
-import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
 
 /**
  * Displays a list of call log entries. To filter for a particular kind of call (all, missed or
@@ -67,7 +66,6 @@ import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClicked
 public class CallLogFragment extends Fragment
     implements CallLogQueryHandler.Listener,
         CallLogAdapter.CallFetcher,
-        CallLogAdapter.MultiSelectRemoveView,
         OnEmptyViewActionButtonClickedListener,
         FragmentCompat.OnRequestPermissionsResultCallback,
         CallLogModalAlertManager.Listener {
@@ -319,7 +317,6 @@ public class CallLogFragment extends Fragment
                 getActivity(),
                 mRecyclerView,
                 this,
-                this,
                 CallLogCache.getCallLogCache(getActivity()),
                 mContactInfoCache,
                 getVoicemailPlaybackPresenter(),
@@ -383,16 +380,6 @@ public class CallLogFragment extends Fragment
   }
 
   @Override
-  public void onStart() {
-    super.onStart();
-    CequintCallerIdManager cequintCallerIdManager = null;
-    if (CequintCallerIdManager.isCequintCallerIdEnabled(getContext())) {
-      cequintCallerIdManager = CequintCallerIdManager.createInstanceForCallLog();
-    }
-    mContactInfoCache.setCequintCallerIdManager(cequintCallerIdManager);
-  }
-
-  @Override
   public void onStop() {
     updateOnTransition();
 
@@ -464,8 +451,6 @@ public class CallLogFragment extends Fragment
       mEmptyListView.setActionLabel(EmptyContentView.NO_LABEL);
     } else if (filterType == CallLogQueryHandler.CALL_TYPE_ALL) {
       mEmptyListView.setActionLabel(R.string.call_log_all_empty_action);
-    } else {
-      mEmptyListView.setActionLabel(EmptyContentView.NO_LABEL);
     }
   }
 
@@ -604,16 +589,6 @@ public class CallLogFragment extends Fragment
     }
   }
 
-  @Override
-  public void showMultiSelectRemoveView(boolean show) {
-    ((ListsFragment) getParentFragment()).showMultiSelectRemoveView(show);
-  }
-
-  @Override
-  public void setSelectAllModeToFalse() {
-    ((ListsFragment) getParentFragment()).setSelectAllModeToFalse();
-  }
-
   public interface HostInterface {
 
     void showDialpad();