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

Commit d43759f0 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am 036da419: am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1 

* commit '036da419':
  Bug 5585323 New system permission for media decode
parents 17fe6c8d 036da419

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -1027,6 +1027,13 @@ 
        android:label="@string/permlab_readLogs"

        android:description="@string/permdesc_readLogs" />



    <!-- Allows an application to use any media decoder when decoding for playback

         @hide -->

    <permission android:name="android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"

        android:protectionLevel="signatureOrSystem"

        android:label="@string/permlab_anyCodecForPlayback"

        android:description="@string/permdesc_anyCodecForPlayback" />



    <!-- ========================================= -->

    <!-- Permissions for special development tools -->

    <!-- ========================================= -->

core/res/res/values/strings.xml

100644 → 100755
+6 −0
Original line number Diff line number Diff line
@@ -821,6 +821,12 @@ 
        information about what you are doing with the phone, potentially

        including personal or private information.</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_anyCodecForPlayback">use any media decoder for playback</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_anyCodecForPlayback">Allows an application to use any installed

        media decoder to decode for playback.</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_diagnostic">read/write to resources owned by diag</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->