diff options
| author | Eric Laurent <elaurent@google.com> | 2014-06-04 18:10:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-04 18:10:25 +0000 |
| commit | 94236c56ddef7f0a3db010c38940f6eae75f67b4 (patch) | |
| tree | 2becc2007e803744abd70b5fb3772ca27c07aa57 | |
| parent | 14830a332f6d7543a749abf6089d1b6782317285 (diff) | |
| parent | 01fae55d175eea6e723d6fa8729bbe868d05cfc2 (diff) | |
| download | frameworks_base-94236c56ddef7f0a3db010c38940f6eae75f67b4.zip frameworks_base-94236c56ddef7f0a3db010c38940f6eae75f67b4.tar.gz frameworks_base-94236c56ddef7f0a3db010c38940f6eae75f67b4.tar.bz2 | |
Merge "add permission for AudioManager routing APIs." into lmp-preview-dev
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index cf765b2..d844818 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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" diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index d4465e6..241526e 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1556,6 +1556,12 @@ 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. --> <string name="permdesc_captureVideoOutput">Allows the app to capture and redirect video output.</string> |