diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-02-19 03:05:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-19 03:05:31 +0000 |
| commit | 3072b0c6b25cf19b7bde38d633788172212d5e34 (patch) | |
| tree | 690adba2922b1043769ac2ac837034a40e96d59e | |
| parent | 73fb5b37a7b49995f7a5ce7e99d637ac9c042c0e (diff) | |
| parent | 7566cd716e33ee61047e431974c6d4a1ef8aa385 (diff) | |
| download | android_packages_apps_Dialer-3072b0c6b25cf19b7bde38d633788172212d5e34.tar.gz android_packages_apps_Dialer-3072b0c6b25cf19b7bde38d633788172212d5e34.tar.bz2 android_packages_apps_Dialer-3072b0c6b25cf19b7bde38d633788172212d5e34.zip | |
Merge "Checking for READ_CONTACTS permission" into nyc-dev
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java b/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java index bf5e1a311..590afafca 100644 --- a/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java +++ b/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java @@ -18,13 +18,13 @@ package com.android.incallui; import com.google.common.primitives.Longs; +import android.Manifest; import android.content.AsyncQueryHandler; import android.content.ContentResolver; import android.content.Context; import android.database.Cursor; import android.database.SQLException; import android.net.Uri; -import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -35,6 +35,7 @@ import android.text.TextUtils; import com.android.contacts.common.ContactsUtils; import com.android.contacts.common.compat.DirectoryCompat; +import com.android.contacts.common.util.PermissionsUtil; import com.android.contacts.common.util.TelephonyManagerUtils; import com.android.dialer.calllog.ContactInfoHelper; import com.android.dialer.service.CachedNumberLookupService; @@ -339,6 +340,12 @@ public class CallerInfoAsyncQuery { Log.d(LOG_TAG, "##### CallerInfoAsyncQuery startContactProviderQuery()... #####"); Log.d(LOG_TAG, "- number: " + info.phoneNumber); Log.d(LOG_TAG, "- cookie: " + cookie); + if (!PermissionsUtil.hasPermission(context, Manifest.permission.READ_CONTACTS)) { + Log.w(LOG_TAG, "Dialer doesn't have permission to read contacts."); + listener.onQueryComplete(token, cookie, info); + return; + } + OnQueryCompleteListener contactsProviderQueryCompleteListener = new OnQueryCompleteListener() { @Override |