commit e710a6fc6663048e0c3302c085a409aa1045a21a
author Svet Ganov <svetoslavganov@google.com> Wed Sep 21 19:50:14 2016 -0700
committer Shijian Li <shijianli@google.com> Thu Jan 19 12:31:42 2017 +0000
tree be0b3505e0fd6a1d62dcca5a6ad03abb5053fe5a
parent 05b2d3eb0defbcc7f4e2aa270cfa179e256e0aeb

Use separate switch ops for runtime permissions

If permissions review is enabled we allow individual
control of fine graned permissions in the SMS group.
This change ensures these permissions use the
corresponding app op as a switch to allow indifidual
control.

Change-Id: I83cd78a78a8266df8324b8a10cd9e36c04ff3112
(cherry picked from commit 99e4d51584202433f1628faa3441e5ced5cf7a0f)

core/java/android/app/AppOpsManager.java

diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index 1e4ffbe..440ddd6 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -403,8 +403,8 @@
             OP_WRITE_SMS,
             OP_RECEIVE_SMS,
             OP_RECEIVE_SMS,
-            OP_RECEIVE_SMS,
-            OP_RECEIVE_SMS,
+            OP_RECEIVE_MMS,
+            OP_RECEIVE_WAP_PUSH,
             OP_SEND_SMS,
             OP_READ_SMS,
             OP_WRITE_SMS,