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

Merge "Bug 3361124 Remove drmioserver"

Browse Source
This commit is contained in:
Glenn Kasten
2011-01-21 07:49:19 -08:00
committed by Android (Google) Code Review
parent 9e9d886b27 e9b467d7dd
commit 0bda68b375
4 changed files with 0 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmds/servicemanager/service_manager.c
View File

@@ -34,7 +34,6 @@ static struct {
{ AID_MEDIA, "media.player" },
{ AID_MEDIA, "media.camera" },
{ AID_MEDIA, "media.audio_policy" },
{ AID_DRMIO, "drm.drmIOService" },
{ AID_DRM, "drm.drmManager" },
{ AID_NFC, "nfc" },
{ AID_RADIO, "radio.phone" },

43
drm/drmioserver/Android.mk
View File

@@ -1,43 +0,0 @@
#
# Copyright (C) 2010 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:= \
main_drmioserver.cpp \
DrmIOService.cpp
LOCAL_SHARED_LIBRARIES := \
libutils \
libbinder
ifeq ($(TARGET_SIMULATOR),true)
LOCAL_LDLIBS += -ldl
else
LOCAL_SHARED_LIBRARIES += libdl
endif
LOCAL_STATIC_LIBRARIES := libdrmframeworkcommon
LOCAL_C_INCLUDES := \
$(TOP)/frameworks/base/drm/libdrmframework/include \
$(TOP)/frameworks/base/include
LOCAL_MODULE:= drmioserver
LOCAL_MODULE_TAGS := optional
include $(BUILD_EXECUTABLE)

49
drm/drmioserver/DrmIOService.cpp
View File

@@ -1,49 +0,0 @@
/*
* Copyright (C) 2010 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.
*/
//#define LOG_NDEBUG 0
#define LOG_TAG "DrmIOService"
#include <utils/Log.h>
#include <binder/IServiceManager.h>
#include "DrmIOService.h"
#include "ReadWriteUtils.h"
using namespace android;
void DrmIOService::instantiate() {
LOGV("instantiate");
defaultServiceManager()->addService(String16("drm.drmIOService"), new DrmIOService());
}
DrmIOService::DrmIOService() {
LOGV("created");
}
DrmIOService::~DrmIOService() {
LOGV("Destroyed");
}
void DrmIOService::writeToFile(const String8& filePath, const String8& dataBuffer) {
LOGV("Entering writeToFile");
ReadWriteUtils::writeToFile(filePath, dataBuffer);
}
String8 DrmIOService::readFromFile(const String8& filePath) {
LOGV("Entering readFromFile");
return ReadWriteUtils::readBytes(filePath);
}

40
drm/drmioserver/main_drmioserver.cpp
View File

@@ -1,40 +0,0 @@
/*
* Copyright (C) 2010 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 <sys/types.h>
#include <unistd.h>
#include <grp.h>
#include <binder/IPCThreadState.h>
#include <binder/ProcessState.h>
#include <binder/IServiceManager.h>
#include <utils/Log.h>
#include <private/android_filesystem_config.h>
#include <DrmIOService.h>
using namespace android;
int main(int argc, char** argv)
{
sp<ProcessState> proc(ProcessState::self());
sp<IServiceManager> sm = defaultServiceManager();
LOGI("ServiceManager: %p", sm.get());
DrmIOService::instantiate();
ProcessState::self()->startThreadPool();
IPCThreadState::self()->joinThreadPool();
}