diff options
| author | 2011-11-09 16:59:48 +0000 | |
|---|---|---|
| committer | 2011-11-09 16:59:48 +0000 | |
| commit | 036da41922c936d25b36fbc4b5927a0097ece330 (patch) | |
| tree | 0cc1d5f8b243996d94080ceec6b229f68275e6b3 | |
| parent | 6e82e95c08bd1e2c46837e9ddb8759e5ca977f84 (diff) | |
| parent | 20cf0916cc6a4920b1d882a9478615a15fe6b3b0 (diff) | |
am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1
* commit '20cf0916cc6a4920b1d882a9478615a15fe6b3b0':
Bug 5585323 New system permission for media decode
| -rw-r--r-- | core/res/AndroidManifest.xml | 7 | ||||
| -rwxr-xr-x[-rw-r--r--] | core/res/res/values/strings.xml | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 0ed0523afc25..230df39f0840 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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 --> <!-- ========================================= --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 2f40a5ad2a2c..9b8be854e325 100644..100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -831,6 +831,12 @@ 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. --> <string name="permdesc_diagnostic">Allows an application to read and write to |