commit 1b9eff4ff187173966186f6fb2889d38037ee9d4
author Yorke Lee <yorkelee@google.com> Mon Sep 21 19:55:18 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 21 19:55:18 2015 +0000
tree b2d6d3cc452fc8326917aa8eabc08f5b475396cb
parent 68870579cdf8b5f0e36bb2b9004375fa1a63deed
parent d2c96928181af43c2e93f1236e4f8f251b1cfb9e

Merge "Protect CallUtil methods with permission check" into ub-contactsdialer-a-dev

src/com/android/contacts/common/CallUtil.java

diff --git a/src/com/android/contacts/common/CallUtil.java b/src/com/android/contacts/common/CallUtil.java
index 1b998b5..041b1b4 100644
--- a/src/com/android/contacts/common/CallUtil.java
+++ b/src/com/android/contacts/common/CallUtil.java
@@ -16,6 +16,7 @@
 
 package com.android.contacts.common;
 
+import com.android.contacts.common.util.PermissionsUtil;
 import com.android.contacts.common.util.PhoneNumberHelper;
 import com.android.phone.common.PhoneConstants;
 
@@ -108,6 +109,9 @@
      *      {@code false} otherwise.
      */
     public static boolean isVideoEnabled(Context context) {
+        if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)) {
+            return false;
+        }
         TelecomManager telecommMgr = (TelecomManager)
                 context.getSystemService(Context.TELECOM_SERVICE);
         if (telecommMgr == null) {
@@ -133,6 +137,9 @@
      *      subject specified, {@code false} otherwise.
      */
     public static boolean isCallWithSubjectSupported(Context context) {
+        if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)) {
+            return false;
+        }
         TelecomManager telecommMgr = (TelecomManager)
                 context.getSystemService(Context.TELECOM_SERVICE);
         if (telecommMgr == null) {