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

Merge "Bug 5585323 New system permission for media decode" into ics-mr1

Browse Source
This commit is contained in:
Jean-Michel Trivi
2011-11-09 08:57:43 -08:00
committed by Android (Google) Code Review
parent b6b44cef94 4ba27fe702
commit 20cf0916cc
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/res/AndroidManifest.xml
View File

@@ -1027,6 +1027,13 @@
android:label="@string/permlab_readLogs" android:label="@string/permlab_readLogs"
android:description="@string/permdesc_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 --> <!-- Permissions for special development tools -->
<!-- ========================================= --> <!-- ========================================= -->

6
core/res/res/values/strings.xml Normal file → Executable file
View File

@@ -830,6 +830,12 @@
information about what you are doing with the phone, potentially information about what you are doing with the phone, potentially
including personal or private information.</string> 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. --> <!-- 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> <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. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->