diff options
| author | David Braun <dabraun@google.com> | 2013-09-10 13:38:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-10 13:38:12 -0700 |
| commit | 84166e888b8a639174f89a215103ba3929014c25 (patch) | |
| tree | 2e1804b356b1556101ecabc4ea404e19ffb8993f | |
| parent | 96f098ea01e6f7b0b42cfe2f929f8ef0b47929bd (diff) | |
| parent | 4cd9612c3268277581589b34cc49ed04c93873b2 (diff) | |
| download | frameworks_base-84166e888b8a639174f89a215103ba3929014c25.zip frameworks_base-84166e888b8a639174f89a215103ba3929014c25.tar.gz frameworks_base-84166e888b8a639174f89a215103ba3929014c25.tar.bz2 | |
am 4cd9612c: am b776122a: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
* commit '4cd9612c3268277581589b34cc49ed04c93873b2':
Factor out read/write SMS settings seperate from send/receive.
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 19a028d..64054c5 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -185,11 +185,11 @@ public class AppOpsManager { OP_CALL_PHONE, OP_READ_SMS, OP_WRITE_SMS, - OP_READ_SMS, - OP_READ_SMS, - OP_READ_SMS, - OP_READ_SMS, - OP_WRITE_SMS, + OP_RECEIVE_SMS, + OP_RECEIVE_SMS, + OP_RECEIVE_SMS, + OP_RECEIVE_SMS, + OP_SEND_SMS, OP_READ_SMS, OP_WRITE_SMS, OP_WRITE_SETTINGS, |