diff options
Diffstat (limited to 'java/com/android/dialer/util')
-rw-r--r-- | java/com/android/dialer/util/CallUtil.java | 22 | ||||
-rw-r--r-- | java/com/android/dialer/util/PermissionsUtil.java | 8 |
2 files changed, 5 insertions, 25 deletions
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. * |