Merge "Remove IMediaDrmService" (8aab9af2) · Commits · e / os / android_frameworks_av

drm/libmediadrm/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ cc_library_shared {
		srcs: [
		"DrmPluginPath.cpp",
		"DrmSessionManager.cpp",
		"IMediaDrmService.cpp",
		"SharedLibrary.cpp",
		"DrmHal.cpp",
		"CryptoHal.cpp",

drm/libmediadrm/IMediaDrmService.cpp

deleted100644 → 0

+0 −57

Original line number	Diff line number	Diff line
		/*
		**
		** Copyright 2015, 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.
		*/

		#include <stdint.h>
		#include <sys/types.h>

		#include <binder/Parcel.h>
		#include <binder/IMemory.h>
		#include <mediadrm/ICrypto.h>
		#include <mediadrm/IDrm.h>
		#include <mediadrm/IMediaDrmService.h>

		#include <utils/Errors.h> // for status_t
		#include <utils/String8.h>

		namespace android {

		class BpMediaDrmService: public BpInterface<IMediaDrmService>
		{
		public:
		explicit BpMediaDrmService(const sp<IBinder>& impl)
		: BpInterface<IMediaDrmService>(impl)
		{
		}

		};

		IMPLEMENT_META_INTERFACE(MediaDrmService, "android.media.IMediaDrmService");

		// ----------------------------------------------------------------------

		status_t BnMediaDrmService::onTransact(
		uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)
		{
		switch (code) {
		default:
		return BBinder::onTransact(code, data, reply, flags);
		}
		}

		// ----------------------------------------------------------------------------

		} // namespace android

drm/libmediadrm/include/mediadrm/IMediaDrmService.h

deleted100644 → 0

+0 −50

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 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.
		*/

		#ifndef ANDROID_IMEDIADRMSERVICE_H
		#define ANDROID_IMEDIADRMSERVICE_H

		#include <utils/Errors.h> // for status_t
		#include <utils/RefBase.h>
		#include <utils/String8.h>
		#include <binder/IInterface.h>
		#include <binder/Parcel.h>

		namespace android {

		struct IDrm;

		class IMediaDrmService: public IInterface
		{
		public:
		DECLARE_META_INTERFACE(MediaDrmService);

		};

		// ----------------------------------------------------------------------------

		class BnMediaDrmService: public BnInterface<IMediaDrmService>
		{
		public:
		virtual status_t onTransact( uint32_t code,
		const Parcel& data,
		Parcel* reply,
		uint32_t flags = 0);
		};

		}; // namespace android

		#endif // ANDROID_IMEDIADRMSERVICE_H

services/mediadrm/Android.mk

+0 −1

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

		LOCAL_SRC_FILES:= \
		MediaDrmService.cpp \
		main_mediadrmserver.cpp

		LOCAL_HEADER_LIBRARIES:= \

services/mediadrm/MediaDrmService.cpp

deleted100644 → 0

+0 −37

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

		// Proxy for media player implementations

		//#define LOG_NDEBUG 0
		#define LOG_TAG "MediaDrmService"

		#include "MediaDrmService.h"
		#include <binder/IServiceManager.h>
		#include <utils/Log.h>

		#include <mediadrm/CryptoHal.h>
		#include <mediadrm/DrmHal.h>

		namespace android {

		void MediaDrmService::instantiate() {
		defaultServiceManager()->addService(
		String16("media.drm"), new MediaDrmService());
		}

		} // namespace android