Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "add permission for AudioManager routing APIs." into lmp-preview-dev

Browse Source
This commit is contained in:
Eric Laurent
2014-06-04 18:10:25 +00:00
committed by Android (Google) Code Review
parent 14830a332f 01fae55d17
commit 94236c56dd
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/res/AndroidManifest.xml
View File

@@ -2225,6 +2225,14 @@
android:description="@string/permdesc_captureAudioHotword"
android:protectionLevel="signature|system" />
<!-- Allows an application to modify audio routing and override policy decisions.
<p>Not for use by third-party applications.</p>
@hide -->
<permission android:name="android.permission.MODIFY_AUDIO_ROUTING"
android:label="@string/permlab_modifyAudioRouting"
android:description="@string/permdesc_modifyAudioRouting"
android:protectionLevel="signature|system" />
<!-- Allows an application to capture video output.
<p>Not for use by third-party applications.</p> -->
<permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT"

6
core/res/res/values/strings.xml
View File

@@ -1555,6 +1555,12 @@
<string name="permdesc_captureAudioHotword">Allows the app to capture audio for Hotword detection. The capture can
happen in the background but does not prevent other audio capture (e.g. Camcorder).</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_modifyAudioRouting">Audio Routing</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_modifyAudioRouting">Allows the app to directly control audio routing and
override audio policy decisions.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_captureVideoOutput">capture video output</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->