summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2015-07-29 20:20:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-29 20:20:49 +0000
commitbd7148418a8089a795eb321087afe81ed90cbe2f (patch)
tree740ed8d326a2da72a6a6286c13d6e5417ea62101
parentcb7b449738925914812f84c961f9f4160fb86458 (diff)
parent3690690053db06a531d5f52df13f9b1f1bb02f76 (diff)
downloadpackages_apps_Contacts-bd7148418a8089a795eb321087afe81ed90cbe2f.tar.gz
packages_apps_Contacts-bd7148418a8089a795eb321087afe81ed90cbe2f.tar.bz2
packages_apps_Contacts-bd7148418a8089a795eb321087afe81ed90cbe2f.zip
am 36906900: am c05c6597: am 615ed9c5: Check for WRITE_CONTACTS permission
* commit '3690690053db06a531d5f52df13f9b1f1bb02f76': Check for WRITE_CONTACTS permission
-rw-r--r--src/com/android/contacts/ContactSaveService.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index dc6cdebbb..6178e9de4 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -16,6 +16,7 @@
package com.android.contacts;
+import static android.Manifest.permission.WRITE_CONTACTS;
import android.app.Activity;
import android.app.IntentService;
import android.content.ContentProviderOperation;
@@ -54,6 +55,7 @@ import com.android.contacts.common.model.RawContactDelta;
import com.android.contacts.common.model.RawContactDeltaList;
import com.android.contacts.common.model.RawContactModifier;
import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.common.util.PermissionsUtil;
import com.android.contacts.editor.ContactEditorFragment;
import com.android.contacts.util.ContactPhotoUtils;
@@ -187,6 +189,14 @@ public class ContactSaveService extends IntentService {
Log.d(TAG, "onHandleIntent: could not handle null intent");
return;
}
+ if (!PermissionsUtil.hasPermission(this, WRITE_CONTACTS)) {
+ Log.w(TAG, "No WRITE_CONTACTS permission, unable to write to CP2");
+ // TODO: add more specific error string such as "Turn on Contacts
+ // permission to update your contacts"
+ showToast(R.string.contactSavedErrorToast);
+ return;
+ }
+
// Call an appropriate method. If we're sure it affects how incoming phone calls are
// handled, then notify the fact to in-call screen.
String action = intent.getAction();