MediaCas: move *.aidl files from frameworks/base to frameworks/av (886aca07) · Commits · e / os / android_frameworks_av

drm/libmediadrm/Android.mk

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -7,13 +7,13 @@ LOCAL_PATH:= $(call my-dir)
	include $(CLEAR_VARS)		include $(CLEAR_VARS)

	LOCAL_AIDL_INCLUDES := \		LOCAL_AIDL_INCLUDES := \
	frameworks/base/media/java		frameworks/av/drm/libmediadrm/aidl

	LOCAL_SRC_FILES := \		LOCAL_SRC_FILES := \
	../../../base/media/java/android/media/ICas.aidl \		aidl/android/media/ICas.aidl \
	../../../base/media/java/android/media/ICasListener.aidl \		aidl/android/media/ICasListener.aidl \
	../../../base/media/java/android/media/IDescrambler.aidl \		aidl/android/media/IDescrambler.aidl \
	../../../base/media/java/android/media/IMediaCasService.aidl \		aidl/android/media/IMediaCasService.aidl \

	LOCAL_SRC_FILES += \		LOCAL_SRC_FILES += \
	CasImpl.cpp \		CasImpl.cpp \

0 → 100644

+34 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* 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

0 → 100644

+22 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* 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

0 → 100644

+27 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* 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

0 → 100644

+32 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* 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);
			}