commit 599705c26c7632eb222ed244343eeac280287f7f
author Treehugger Robot <treehugger-gerrit@google.com> Mon May 21 21:45:31 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 21 21:45:31 2018 +0000
tree 90263793ac167c4588f8d462d431d2a8bcfc1392
parent 4791039e1e62ff6fc22f063dbf363fb6864c87ad
parent 857de2fe89bd9daa3fa836998568208d7c8ce575

Merge "Check READ_PHONE_STATE for isVoicemailAvailable()"

java/com/android/dialer/main/impl/OldMainActivityPeer.java

diff --git a/java/com/android/dialer/main/impl/OldMainActivityPeer.java b/java/com/android/dialer/main/impl/OldMainActivityPeer.java
index 402edb3..a0e92a8 100644
--- a/java/com/android/dialer/main/impl/OldMainActivityPeer.java
+++ b/java/com/android/dialer/main/impl/OldMainActivityPeer.java
@@ -372,7 +372,7 @@
   private static boolean isVoicemailAvailable(
       Context context, PhoneAccountHandle defaultUserSelectedAccount) {
 
-    if (!TelecomUtil.hasReadPhoneStatePermission(context)) {
+    if (!PermissionsUtil.hasReadPhoneStatePermissions(context)) {
       LogUtil.i(
           "OldMainActivityPeer.isVoicemailAvailable",
           "No read phone permisison or not the default dialer.");

java/com/android/dialer/telecom/TelecomUtil.java

diff --git a/java/com/android/dialer/telecom/TelecomUtil.java b/java/com/android/dialer/telecom/TelecomUtil.java
index 8c00909..c088146 100644
--- a/java/com/android/dialer/telecom/TelecomUtil.java
+++ b/java/com/android/dialer/telecom/TelecomUtil.java
@@ -275,15 +275,21 @@
             && hasPermission(context, Manifest.permission.WRITE_VOICEMAIL));
   }
 
+  /** @deprecated use {@link com.android.dialer.util.PermissionsUtil} */
+  @Deprecated
   public static boolean hasModifyPhoneStatePermission(Context context) {
     return isDefaultDialer(context)
         || hasPermission(context, Manifest.permission.MODIFY_PHONE_STATE);
   }
 
+  /** @deprecated use {@link com.android.dialer.util.PermissionsUtil} */
+  @Deprecated
   public static boolean hasReadPhoneStatePermission(Context context) {
     return isDefaultDialer(context) || hasPermission(context, Manifest.permission.READ_PHONE_STATE);
   }
 
+  /** @deprecated use {@link com.android.dialer.util.PermissionsUtil} */
+  @Deprecated
   public static boolean hasCallPhonePermission(Context context) {
     return isDefaultDialer(context) || hasPermission(context, Manifest.permission.CALL_PHONE);
   }