Commit e7e382df authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 23aa56bf: Merge "App ops: add operations for reading/writing clipboard." into jb-mr2-dev

* commit '23aa56bf':
  App ops: add operations for reading/writing clipboard.
parents fda70e88 23aa56bf
......@@ -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. -->
......
......@@ -115,13 +115,17 @@ public class AppOpsState {
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(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment