Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaa68897 authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 25d7a394: Merge "add permission for AudioManager routing APIs." into lmp-preview-dev 

* commit '25d7a394c0cf91d9e9711d3f36913f4ed8aa91d8':
  add permission for AudioManager routing APIs.
parents 7cbd327d 94236c56

core/res/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -2239,6 +2239,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"

core/res/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -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. -->