diff options
author | Yorke Lee <yorkelee@google.com> | 2015-05-26 17:28:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-26 17:28:57 +0000 |
commit | 44ed26cfc052715acc7e3be088cb49b733ddef35 (patch) | |
tree | c33839a5b05d8880826eab54ff62609dc9fba1af /src/com/android/dialer/dialpad/DialpadFragment.java | |
parent | 2e1bfd309fa4371d329e9741aa65da90a375109c (diff) | |
parent | c16ea5ad67bf454158b364dec2f26c95a879c350 (diff) |
Merge "Handle runtime permissions in Dialer" into mnc-dev
Diffstat (limited to 'src/com/android/dialer/dialpad/DialpadFragment.java')
-rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index 8d27c143b..de1d44f89 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -70,6 +70,7 @@ import android.widget.TextView; import com.android.contacts.common.ContactsUtils; import com.android.contacts.common.GeoUtil; +import com.android.contacts.common.util.PermissionsUtil; import com.android.contacts.common.util.PhoneNumberFormatter; import com.android.contacts.common.util.StopWatch; import com.android.contacts.common.widget.FloatingActionButtonController; @@ -441,6 +442,9 @@ public class DialpadFragment extends Fragment setFormattedDigits(converted, null); return true; } else { + if (!PermissionsUtil.hasContactsPermissions(getActivity())) { + return false; + } String type = intent.getType(); if (People.CONTENT_ITEM_TYPE.equals(type) || Phones.CONTENT_ITEM_TYPE.equals(type)) { |