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

MediaCas: move *.aidl files from frameworks/base to frameworks/av

Browse Source 
PDK builds can't reference frameworks/base from frameworks/av.

bug: 22804304
Change-Id: Ibcda0b6a56e36233ad37c2d5d2b03d5c58674010
This commit is contained in:
Chong Zhang
2017-02-27 16:06:46 -08:00
parent 7485a9bbb3
commit c1e701d03f
7 changed files with 5 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Android.mk
View File

@@ -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

34
media/java/android/media/ICas.aidl
View File

@@ -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();
}

22
media/java/android/media/ICasListener.aidl
View File

@@ -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);
}

27
media/java/android/media/IDescrambler.aidl
View File

@@ -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();
}

32
media/java/android/media/IMediaCasService.aidl
View File

@@ -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);
}

23
media/java/android/media/MediaCas.aidl
View File

@@ -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";

20
media/java/android/media/MediaDescrambler.aidl
View File

@@ -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";