From 122fb0b6c58774c75e06cbf786d0f366b674c163 Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Mon, 26 Mar 2018 13:35:32 -0700
Subject: Remove obsolete methods in CompatUtils and rename it as
 "LocaleUtils".

Test: Existing tests
PiperOrigin-RevId: 190516504
Change-Id: I5fa9e123b45beb9728257ecd160a348fb3f4732c
---
 java/com/android/dialer/util/CallUtil.java | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'java/com/android/dialer/util/CallUtil.java')

diff --git a/java/com/android/dialer/util/CallUtil.java b/java/com/android/dialer/util/CallUtil.java
index 22cab87cc..89af0b9bb 100644
--- a/java/com/android/dialer/util/CallUtil.java
+++ b/java/com/android/dialer/util/CallUtil.java
@@ -16,13 +16,13 @@
 
 package com.android.dialer.util;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.CompatUtils;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import java.util.List;
 
@@ -62,9 +62,9 @@ public class CallUtil {
    * @param context The context
    * @return A bit-mask describing the current video capabilities.
    */
+  @SuppressLint("MissingPermission")
   public static int getVideoCallingAvailability(Context context) {
-    if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)
-        || !CompatUtils.isVideoCompatible()) {
+    if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)) {
       return VIDEO_CALLING_DISABLED;
     }
     TelecomManager telecommMgr = (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
@@ -77,11 +77,6 @@ public class CallUtil {
       PhoneAccount account = telecommMgr.getPhoneAccount(accountHandle);
       if (account != null) {
         if (account.hasCapabilities(PhoneAccount.CAPABILITY_VIDEO_CALLING)) {
-          // Builds prior to N do not have presence support.
-          if (!CompatUtils.isVideoPresenceCompatible()) {
-            return VIDEO_CALLING_ENABLED;
-          }
-
           int videoCapabilities = VIDEO_CALLING_ENABLED;
           if (account.hasCapabilities(PhoneAccount.CAPABILITY_VIDEO_CALLING_RELIES_ON_PRESENCE)) {
             videoCapabilities |= VIDEO_CALLING_PRESENCE;
@@ -128,9 +123,9 @@ public class CallUtil {
    * @return {@code true} if one of the call capable phone accounts supports calling with a subject
    *     specified, {@code false} otherwise.
    */
+  @SuppressLint("MissingPermission")
   public static boolean isCallWithSubjectSupported(Context context) {
-    if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)
-        || !CompatUtils.isCallSubjectCompatible()) {
+    if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)) {
       return false;
     }
     TelecomManager telecommMgr = (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
-- 
cgit v1.2.3