PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 87b69c30: am b8a90e50: Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev

Browse Source 
* commit '87b69c303063321e871028ff713c26e200d32cc4':
  Add OP_PROJECT_MEDIA to AppOps
This commit is contained in:
Michael Wright
2014-07-18 00:32:08 +00:00
committed by Android Git Automerger
parent 951b69ee65 87b69c3030
commit 9292e27026
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/arrays.xml
View File

@@ -641,10 +641,12 @@
<item>alarm volume</item>
<item>notification volume</item>
<item>bluetooth volume</item>
<item>mute/unmute microphone</item>
<item>keep awake</item>
<item>monitor location</item>
<item>monitor high power location</item>
<item>get usage stats</item>
<item>mute/unmute microphone</item>
<item>project media</item>
</string-array>
<!-- User display names for app ops codes -->
@@ -689,10 +691,12 @@
<item>Alarm volume</item>
<item>Notification volume</item>
<item>Bluetooth volume</item>
<item>Mute/unmute microphone</item>
<item>Keep awake</item>
<item>Location</item>
<item>Location</item>
<item>Get usage stats</item>
<item>Mute/unmute microphone</item>
<item>Project media</item>
</string-array>
<!-- Titles for the list of long press timeout options. -->

6
src/com/android/settings/applications/AppOpsState.java
View File

@@ -189,13 +189,15 @@ public class AppOpsState {
AppOpsManager.OP_CALL_PHONE,
AppOpsManager.OP_WRITE_SETTINGS,
AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
AppOpsManager.OP_WAKE_LOCK },
AppOpsManager.OP_WAKE_LOCK,
AppOpsManager.OP_PROJECT_MEDIA },
new boolean[] { false,
true,
true,
true,
true,
true, }
true,
false, }
);
public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] {