From cded3beaf28a703e1ef8f71bbc6836e6806c3736 Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Fri, 9 Jun 2017 14:16:05 +0000
Subject: 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
---
 java/com/android/dialer/util/CallUtil.java        | 22 +---------------------
 java/com/android/dialer/util/PermissionsUtil.java |  8 ++++----
 2 files changed, 5 insertions(+), 25 deletions(-)

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

diff --git a/java/com/android/dialer/util/CallUtil.java b/java/com/android/dialer/util/CallUtil.java
index b6ab3b30e..81a4bb21e 100644
--- a/java/com/android/dialer/util/CallUtil.java
+++ b/java/com/android/dialer/util/CallUtil.java
@@ -21,7 +21,6 @@ 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;
@@ -41,9 +40,6 @@ public class CallUtil {
    */
   public static final int VIDEO_CALLING_PRESENCE = 2;
 
-  private static boolean hasInitializedIsVideoEnabledState;
-  private static boolean cachedIsVideoEnabledState;
-
   /** Return Uri with an appropriate scheme, accepting both SIP and usual phone call numbers. */
   public static Uri getCallUri(String number) {
     if (PhoneNumberHelper.isUriNumber(number)) {
@@ -106,23 +102,7 @@ public class CallUtil {
    *     false} otherwise.
    */
   public static boolean isVideoEnabled(Context context) {
-    boolean isVideoEnabled = (getVideoCallingAvailability(context) & VIDEO_CALLING_ENABLED) != 0;
-
-    // Log everytime the video enabled state changes.
-    if (!hasInitializedIsVideoEnabledState) {
-      LogUtil.i("CallUtil.isVideoEnabled", "isVideoEnabled: " + isVideoEnabled);
-      hasInitializedIsVideoEnabledState = true;
-      cachedIsVideoEnabledState = isVideoEnabled;
-    } else if (cachedIsVideoEnabledState != isVideoEnabled) {
-      LogUtil.i(
-          "CallUtil.isVideoEnabled",
-          "isVideoEnabled changed from %b to %b",
-          cachedIsVideoEnabledState,
-          isVideoEnabled);
-      cachedIsVideoEnabledState = isVideoEnabled;
-    }
-
-    return true;
+    return (getVideoCallingAvailability(context) & VIDEO_CALLING_ENABLED) != 0;
   }
 
   /**
diff --git a/java/com/android/dialer/util/PermissionsUtil.java b/java/com/android/dialer/util/PermissionsUtil.java
index 72a59eaef..466e86204 100644
--- a/java/com/android/dialer/util/PermissionsUtil.java
+++ b/java/com/android/dialer/util/PermissionsUtil.java
@@ -72,15 +72,15 @@ public class PermissionsUtil {
     return hasPermission(context, permission.WRITE_VOICEMAIL);
   }
 
+  public static boolean hasAddVoicemailPermissions(Context context) {
+    return hasPermission(context, permission.ADD_VOICEMAIL);
+  }
+
   public static boolean hasPermission(Context context, String permission) {
     return ContextCompat.checkSelfPermission(context, permission)
         == PackageManager.PERMISSION_GRANTED;
   }
 
-  public static boolean hasAddVoicemailPermissions(Context context) {
-    return hasPermission(context, permission.ADD_VOICEMAIL);
-  }
-
   /**
    * Checks {@link android.content.SharedPreferences} if a permission has been requested before.
    *
-- 
cgit v1.2.3