Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88888a46 authored by Jaewoong Jung's avatar Jaewoong Jung
Browse files

Revert "Remove (I)MediaDrmService" 

This reverts commit 54482b57.

Reason for revert: Broke git_master on build_test

Fixes: 144601027
Change-Id: Id98fe3875a7e06bcae9c640958e28217a68fbc25
parent 54482b57

drm/libmediadrm/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ cc_library_shared { 
    srcs: [

        "DrmPluginPath.cpp",

        "DrmSessionManager.cpp",

        "IMediaDrmService.cpp",

        "SharedLibrary.cpp",

        "DrmHal.cpp",

        "CryptoHal.cpp",

drm/libmediadrm/IMediaDrmService.cpp

0 → 100644
+57 −0
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

0 → 100644
+50 −0
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

media/mediaserver/mediaserver.rc

+0 −3
Original line number Diff line number Diff line 
on property:init.svc.media=*

    setprop init.svc.mediadrm ${init.svc.media}



service media /system/bin/mediaserver

    class main

    user media

services/mediadrm/Android.mk

0 → 100644
+53 −0
Original line number Diff line number Diff line 
# Copyright 2014 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.



LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

    MediaDrmService.cpp \

    main_mediadrmserver.cpp



LOCAL_HEADER_LIBRARIES:= \

    libmedia_headers \

    libmediadrm_headers



LOCAL_SHARED_LIBRARIES:= \

    libbinder \

    liblog \

    libmedia \

    libmediadrm \

    libutils \

    libhidlbase \

    libhidlmemory \

    android.hardware.drm@1.0 \

    android.hardware.drm@1.1 \

    android.hardware.drm@1.2



LOCAL_CFLAGS += -Wall -Wextra -Werror



LOCAL_MODULE:= mediadrmserver



# TODO: Some legacy DRM plugins only support 32-bit. They need to be migrated to

# 64-bit. (b/18948909) Once all of a device's legacy DRM plugins support 64-bit,

# that device can turn on TARGET_ENABLE_MEDIADRM_64 to build this service as

# 64-bit.

ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)

LOCAL_32_BIT_ONLY := true

endif



LOCAL_INIT_RC := mediadrmserver.rc



include $(BUILD_EXECUTABLE)