diff --git a/Android.mk b/Android.mk index 109f6105e10a1..45f370105dcb3 100644 --- a/Android.mk +++ b/Android.mk @@ -408,10 +408,10 @@ LOCAL_SRC_FILES += \ location/java/android/location/INetInitiatedListener.aidl \ location/java/com/android/internal/location/ILocationProvider.aidl \ media/java/android/media/IAudioService.aidl \ - media/java/android/media/ICas.aidl \ - media/java/android/media/ICasListener.aidl \ - media/java/android/media/IDescrambler.aidl \ - media/java/android/media/IMediaCasService.aidl \ + ../av/drm/libmediadrm/aidl/android/media/ICas.aidl \ + ../av/drm/libmediadrm/aidl/android/media/ICasListener.aidl \ + ../av/drm/libmediadrm/aidl/android/media/IDescrambler.aidl \ + ../av/drm/libmediadrm/aidl/android/media/IMediaCasService.aidl \ media/java/android/media/IAudioFocusDispatcher.aidl \ media/java/android/media/IAudioRoutesObserver.aidl \ media/java/android/media/IMediaHTTPConnection.aidl \ @@ -537,6 +537,7 @@ LOCAL_AIDL_INCLUDES += \ LOCAL_AIDL_INCLUDES += \ frameworks/av/camera/aidl \ + frameworks/av/drm/libmediadrm/aidl \ frameworks/native/aidl/gui \ system/netd/server/binder diff --git a/media/java/android/media/ICas.aidl b/media/java/android/media/ICas.aidl deleted file mode 100644 index 6b2ce4ab973df..0000000000000 --- a/media/java/android/media/ICas.aidl +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2017 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 android.media; - -import android.media.MediaCas; - -/** @hide */ -interface ICas { - void setPrivateData(in byte[] pvtData); - byte[] openSession(int program_number); - byte[] openSessionForStream(int program_number, int elementary_PID); - void closeSession(in byte[] sessionId); - void setSessionPrivateData(in byte[] sessionId, in byte[] pvtData); - void processEcm(in byte[] sessionId, in MediaCas.ParcelableCasData ecm); - void processEmm(in MediaCas.ParcelableCasData emm); - void sendEvent(int event, int arg, in @nullable byte[] eventData); - void provision(String provisionString); - void refreshEntitlements(int refreshType, in @nullable byte[] refreshData); - void release(); -} \ No newline at end of file diff --git a/media/java/android/media/ICasListener.aidl b/media/java/android/media/ICasListener.aidl deleted file mode 100644 index 01a5abc883b21..0000000000000 --- a/media/java/android/media/ICasListener.aidl +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2017 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 android.media; - -/** @hide */ -interface ICasListener { - void onEvent(int event, int arg, in @nullable byte[] data); -} \ No newline at end of file diff --git a/media/java/android/media/IDescrambler.aidl b/media/java/android/media/IDescrambler.aidl deleted file mode 100644 index fdf99eba627dd..0000000000000 --- a/media/java/android/media/IDescrambler.aidl +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2017 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 android.media; - -import android.media.MediaDescrambler; - -/** @hide */ -interface IDescrambler { - void setMediaCasSession(in byte[] sessionId); - boolean requiresSecureDecoderComponent(String mime); - int descramble(in MediaDescrambler.DescrambleInfo descrambleInfo); - void release(); -} \ No newline at end of file diff --git a/media/java/android/media/IMediaCasService.aidl b/media/java/android/media/IMediaCasService.aidl deleted file mode 100644 index 44f682518832e..0000000000000 --- a/media/java/android/media/IMediaCasService.aidl +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2017 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 android.media; - -import android.media.IDescrambler; -import android.media.ICas; -import android.media.ICasListener; -import android.media.MediaCas; - -/** @hide */ -interface IMediaCasService { - MediaCas.ParcelableCasPluginDescriptor[] enumeratePlugins(); - boolean isSystemIdSupported(int CA_system_id); - ICas createPlugin(int CA_system_id, ICasListener listener); - boolean isDescramblerSupported(int CA_system_id); - IDescrambler createDescrambler(int CA_system_id); -} - diff --git a/media/java/android/media/MediaCas.aidl b/media/java/android/media/MediaCas.aidl deleted file mode 100644 index cb8d0c65b0b9c..0000000000000 --- a/media/java/android/media/MediaCas.aidl +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2017 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 android.media; - -/** @hide */ -parcelable MediaCas.ParcelableCasPluginDescriptor cpp_header "media/MediaCasDefs.h"; - -/** @hide */ -parcelable MediaCas.ParcelableCasData cpp_header "media/MediaCasDefs.h"; \ No newline at end of file diff --git a/media/java/android/media/MediaDescrambler.aidl b/media/java/android/media/MediaDescrambler.aidl deleted file mode 100644 index e7892442ef1a0..0000000000000 --- a/media/java/android/media/MediaDescrambler.aidl +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (C) 2017 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 android.media; - -/** @hide */ -parcelable MediaDescrambler.DescrambleInfo cpp_header "media/MediaCasDefs.h"; \ No newline at end of file