commit a949dd47879ee0852cdca25f345abf888b457e80
author Tingting Wang <tingtingw@google.com> Fri Sep 25 17:54:13 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 25 17:54:13 2015 +0000
tree ea68b19ca3f70bdc6d6a1dfc4983943224126dd8
parent aa6a51cec4c7d3195f8bc949712f14a561809073
parent e671ffdc6b6237637affd7f3ac88cea9f0b63fbb

Merge "Add suggestion card for quick contact (P1)" 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) {

src/com/android/contacts/common/model/RawContactDelta.java

diff --git a/src/com/android/contacts/common/model/RawContactDelta.java b/src/com/android/contacts/common/model/RawContactDelta.java
index 7304f02..b60e00e 100644
--- a/src/com/android/contacts/common/model/RawContactDelta.java
+++ b/src/com/android/contacts/common/model/RawContactDelta.java
@@ -243,7 +243,7 @@
      * Return the list of child {@link ValuesDelta} from our optimized map,
      * creating the list if requested.
      */
-    private ArrayList<ValuesDelta> getMimeEntries(String mimeType, boolean lazyCreate) {
+    public ArrayList<ValuesDelta> getMimeEntries(String mimeType, boolean lazyCreate) {
         ArrayList<ValuesDelta> mimeEntries = mEntries.get(mimeType);
         if (mimeEntries == null && lazyCreate) {
             mimeEntries = Lists.newArrayList();