commit c880b74ec26e41c3500c9d313c5cfb47f8edf4c0
author Wenyi Wang <wenyiw@google.com> Wed Dec 23 00:57:13 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 23 00:57:13 2015 +0000
tree ed993e3a50c9e146446d828035e8cea00a4e22c2
parent b8e0f40953f4b2d1a2c96b117784e071d3e6589e
parent c85af2872f231f48b586c30f6306083a039dd6c6

Merge "Backport ContactsContract methods (1/2)" into ub-contactsdialer-b-dev

src/com/android/contacts/compat/ProviderStatusCompat.java

diff --git a/src/com/android/contacts/compat/ProviderStatusCompat.java b/src/com/android/contacts/compat/ProviderStatusCompat.java
index 4c36d12..2b5c820 100644
--- a/src/com/android/contacts/compat/ProviderStatusCompat.java
+++ b/src/com/android/contacts/compat/ProviderStatusCompat.java
@@ -18,6 +18,8 @@
 
 import android.os.Build;
 import android.provider.ContactsContract.ProviderStatus;
+
+import com.android.contacts.common.compat.CompatUtils;
 import com.android.contacts.common.compat.SdkVersionOverride;
 
 /**
@@ -33,8 +35,7 @@
     private ProviderStatusCompat() {
     }
 
-    public static final boolean USE_CURRENT_VERSION =
-            SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.LOLLIPOP) >= Build.VERSION_CODES.M;
+    public static final boolean USE_CURRENT_VERSION = CompatUtils.isMarshmallowCompatible();
 
     public static final int STATUS_EMPTY = USE_CURRENT_VERSION ?
             ProviderStatus.STATUS_EMPTY : ProviderStatusCompat.STATUS_NO_ACCOUNTS_NO_CONTACTS;

src/com/android/contacts/compat/TelephonyManagerCompat.java

diff --git a/src/com/android/contacts/compat/TelephonyManagerCompat.java b/src/com/android/contacts/compat/TelephonyManagerCompat.java
deleted file mode 100644
index 1620ba8..0000000
--- a/src/com/android/contacts/compat/TelephonyManagerCompat.java
+++ /dev/null
@@ -1,41 +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.contacts.compat;
-
-import android.content.Context;
-import android.os.Build;
-import android.telephony.TelephonyManager;
-
-import com.android.contacts.common.compat.SdkVersionOverride;
-
-public class TelephonyManagerCompat {
-    public static boolean isVoiceCapable(Context context) {
-        final TelephonyManager telephonyManager
-                = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        if (telephonyManager == null) {
-            return false;
-        }
-        if (SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.M)
-                >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            // isVoiceCapable was unhidden in L-MR1
-            return telephonyManager.isVoiceCapable();
-        }
-        final int phoneType = telephonyManager.getPhoneType();
-        return phoneType == TelephonyManager.PHONE_TYPE_CDMA ||
-                phoneType == TelephonyManager.PHONE_TYPE_GSM;
-    }
-}

src/com/android/contacts/util/PhoneCapabilityTester.java

diff --git a/src/com/android/contacts/util/PhoneCapabilityTester.java b/src/com/android/contacts/util/PhoneCapabilityTester.java
index 37cebf1..d1373f4 100644
--- a/src/com/android/contacts/util/PhoneCapabilityTester.java
+++ b/src/com/android/contacts/util/PhoneCapabilityTester.java
@@ -25,9 +25,10 @@
 import android.net.sip.SipManager;
 import android.provider.MediaStore;
 import android.provider.Telephony;
+import android.telephony.TelephonyManager;
 
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.compat.TelephonyManagerCompat;
+import com.android.contacts.common.compat.TelephonyManagerCompat;
 
 import java.util.List;
 
@@ -61,7 +62,8 @@
     }
 
     private static void initialize(Context context) {
-        sIsPhone = TelephonyManagerCompat.isVoiceCapable(context);
+        sIsPhone = TelephonyManagerCompat.isVoiceCapable(
+                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE));
         sIsSipPhone = sIsPhone && SipManager.isVoipSupported(context);
         sIsInitialized = true;
     }