Update AOSP Dialer source from internal google3 repository at cl/158012278.

am: 91ce7d2a47

Change-Id: I1744a8bfca09eae5e9c0d7aac122515eca75bb8b

2 files changed, 1 insertions, 79 deletions

diff --git a/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java b/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java
index 7645a333e..6728dfb38 100644
--- a/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java
+++ b/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java
@@ -19,7 +19,6 @@ package com.android.dialer.app.calllog.calllogcache;
 import android.content.Context;
 import android.telecom.PhoneAccountHandle;
 import com.android.dialer.app.calllog.CallLogAdapter;
-import com.android.dialer.compat.CompatUtils;
 import com.android.dialer.util.CallUtil;
 
 /**
@@ -46,10 +45,7 @@ public abstract class CallLogCache {
 
   /** Return the most compatible version of the TelecomCallLogCache. */
   public static CallLogCache getCallLogCache(Context context) {
-    if (CompatUtils.isClassAvailable("android.telecom.PhoneAccountHandle")) {
-      return new CallLogCacheLollipopMr1(context);
-    }
-    return new CallLogCacheLollipop(context);
+    return new CallLogCacheLollipopMr1(context);
   }
 
   public void reset() {
diff --git a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipop.java b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipop.java
deleted file mode 100644
index 78aaa4193..000000000
--- a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipop.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.app.calllog.calllogcache;
-
-import android.content.Context;
-import android.telecom.PhoneAccount;
-import android.telecom.PhoneAccountHandle;
-import android.telephony.PhoneNumberUtils;
-import android.text.TextUtils;
-
-/**
- * This is a compatibility class for the CallLogCache for versions of dialer before Lollipop Mr1
- * (the introduction of phone accounts).
- *
- * <p>This class should not be initialized directly and instead be acquired from {@link
- * CallLogCache#getCallLogCache}.
- */
-class CallLogCacheLollipop extends CallLogCache {
-
-  private String mVoicemailNumber;
-
-  /* package */ CallLogCacheLollipop(Context context) {
-    super(context);
-  }
-
-  @Override
-  public boolean isVoicemailNumber(PhoneAccountHandle accountHandle, CharSequence number) {
-    if (TextUtils.isEmpty(number)) {
-      return false;
-    }
-
-    String numberString = number.toString();
-
-    if (!TextUtils.isEmpty(mVoicemailNumber)) {
-      return PhoneNumberUtils.compare(numberString, mVoicemailNumber);
-    }
-
-    if (PhoneNumberUtils.isVoiceMailNumber(numberString)) {
-      mVoicemailNumber = numberString;
-      return true;
-    }
-
-    return false;
-  }
-
-  @Override
-  public String getAccountLabel(PhoneAccountHandle accountHandle) {
-    return null;
-  }
-
-  @Override
-  public int getAccountColor(PhoneAccountHandle accountHandle) {
-    return PhoneAccount.NO_HIGHLIGHT_COLOR;
-  }
-
-  @Override
-  public boolean doesAccountSupportCallSubject(PhoneAccountHandle accountHandle) {
-    return false;
-  }
-}