Merge "App ops: add operations for reading/writing clipboard." into jb-mr2-dev
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 23c6c82..99946ea 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -592,6 +592,8 @@
<item>camera</item>
<item>record audio</item>
<item>play audio</item>
+ <item>read clipboard</item>
+ <item>modify clipboard</item>
</string-array>
<!-- User display names for app ops codes -->
@@ -625,6 +627,8 @@
<item>Camera</item>
<item>Record audio</item>
<item>Play audio</item>
+ <item>Read clipboard</item>
+ <item>Modify clipboard</item>
</string-array>
<!-- Titles for the list of long press timeout options. -->
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index 39ce0b9..6cdbdaf 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -115,13 +115,17 @@
AppOpsManager.OP_READ_CALL_LOG,
AppOpsManager.OP_WRITE_CALL_LOG,
AppOpsManager.OP_READ_CALENDAR,
- AppOpsManager.OP_WRITE_CALENDAR },
+ AppOpsManager.OP_WRITE_CALENDAR,
+ AppOpsManager.OP_READ_CLIPBOARD,
+ AppOpsManager.OP_WRITE_CLIPBOARD },
new boolean[] { true,
true,
true,
true,
true,
- true }
+ true,
+ false,
+ false }
);
public static final OpsTemplate MESSAGING_TEMPLATE = new OpsTemplate(