diff options
Diffstat (limited to 'core')
-rwxr-xr-x | core/java/com/android/internal/app/IMediaContainerService.aidl | 28 | ||||
-rw-r--r-- | core/res/AndroidManifest.xml | 10 | ||||
-rw-r--r-- | core/res/res/values/strings.xml | 6 |
3 files changed, 44 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/IMediaContainerService.aidl b/core/java/com/android/internal/app/IMediaContainerService.aidl new file mode 100755 index 0000000..726e28f --- /dev/null +++ b/core/java/com/android/internal/app/IMediaContainerService.aidl @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.app; + +import android.net.Uri; +import android.os.ParcelFileDescriptor; + +interface IMediaContainerService { + String copyResourceToContainer(in Uri packageURI, + String containerId, + String key, String resFileName); + boolean copyResource(in Uri packageURI, + in ParcelFileDescriptor outStream); +}
\ No newline at end of file diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ac6467d..54e15a5 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1202,6 +1202,16 @@ android:description="@string/permdesc_cache_filesystem" android:protectionLevel="signatureOrSystem" /> + <!-- Must be required by default container service so that only + the system can bind to it and use it to copy + protected data to secure containers or files + accessible to the system. + @hide --> + <permission android:name="android.permission.COPY_PROTECTED_DATA" + android:label="@string/permlab_copyProtectedData" + android:description="@string/permlab_copyProtectedData" + android:protectionLevel="signature" /> + <application android:process="system" android:persistent="true" android:hasCode="false" diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 8c46f58..31f71d3 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2102,6 +2102,12 @@ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_pkgUsageStats">Allows the modification of collected component usage statistics. Not for use by normal applications.</string> + <!-- permission attributes related to default container service --> + <!-- Title of an application permission that lets an application use default container service. --> + <string name="permlab_copyProtectedData">Allows to invoke default container service to copy content. Not for use by normal applications.</string> + <!-- Description of an application permission, used to invoke default container service to copy content. --> + <string name="permdesc_copyProtectedData">Allows to invoke default container service to copy content. Not for use by normal applications.</string> + <!-- Shown in the tutorial for tap twice for zoom control. --> <string name="tutorial_double_tap_to_zoom_message_short">Tap twice for zoom control</string> |