diff options
author | 2015-07-15 13:32:50 -0700 | |
---|---|---|
committer | 2015-07-15 22:51:53 +0000 | |
commit | 604158669b407a40cd0f23538fad4dce5d738f24 (patch) | |
tree | 85aab20d4da9aa12bdd409ce04541db25de1e2f4 /java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java | |
parent | 7d5fb3a9430550a3ccf1ed5afd70dbf8cc81574a (diff) | |
download | latinime-604158669b407a40cd0f23538fad4dce5d738f24.tar.gz latinime-604158669b407a40cd0f23538fad4dce5d738f24.tar.xz latinime-604158669b407a40cd0f23538fad4dce5d738f24.zip |
[LatinIME] Support MNC permissions.
This build has been compiled against API 23
This build is approved to go out with the M OTA, but may NOT be released
to the public until the Play Store has enabled API level 23 apps
Version: 4.1.2300x.build_id
1. Replaces the personalization is on information with the suggest
contacts.
2. Enables "Use Contacts" only if the app has permission to read
contacts.
3. Disables the contacts dictionary in the Facilitator.
4. Do not register/read the contacts in the contact observer.
Bug: 22236416
Change-Id: I9674e13d0d0f4a2014c5024fde0178de684c07e7
Diffstat (limited to 'java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java')
-rw-r--r-- | java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java index 15a14e5af..dbd639fe8 100644 --- a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java @@ -16,6 +16,7 @@ package com.android.inputmethod.latin; +import android.Manifest; import android.content.Context; import android.net.Uri; import android.provider.ContactsContract; @@ -25,6 +26,7 @@ import android.util.Log; import com.android.inputmethod.annotations.ExternallyReferenced; import com.android.inputmethod.latin.ContactsManager.ContactsChangedListener; import com.android.inputmethod.latin.common.StringUtils; +import com.android.inputmethod.latin.permissions.PermissionsUtil; import com.android.inputmethod.latin.personalization.AccountUtils; import java.io.File; @@ -108,6 +110,11 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary * Loads data within content providers to the dictionary. */ private void loadDictionaryForUriLocked(final Uri uri) { + if (!PermissionsUtil.checkAllPermissionsGranted( + mContext, Manifest.permission.READ_CONTACTS)) { + Log.i(TAG, "No permission to read contacts. Not loading the Dictionary."); + } + final ArrayList<String> validNames = mContactsManager.getValidNames(uri); for (final String name : validNames) { addNameLocked(name); |