From e74282b70b4a8ad1186fdc32204e1ecee16cd901 Mon Sep 17 00:00:00 2001 From: Jinsuk Kim Date: Thu, 29 May 2014 07:39:22 +0900 Subject: DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiControlService HdmiCecService will soon be deprecated and replaced with HdmiControlService. Stopped publishing the service, and turned the corresponding manager to stub so that it will do nothing but print out a warning msg instead. Will help the app transition to the new service in the meantime. Once the migration is finished, will gut out all the HdmiCecService/ HdmiCecManager stuff. Change-Id: Ic34a69c4fb99f4e5a2c8323538195204ab16a545 --- services/core/java/com/android/server/hdmi/HdmiCecService.java | 9 ++------- .../core/java/com/android/server/hdmi/HdmiControlService.java | 3 +-- services/core/jni/com_android_server_hdmi_HdmiCecController.cpp | 7 ------- 3 files changed, 3 insertions(+), 16 deletions(-) (limited to 'services') diff --git a/services/core/java/com/android/server/hdmi/HdmiCecService.java b/services/core/java/com/android/server/hdmi/HdmiCecService.java index 0a4c719..98dc72f 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecService.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecService.java @@ -75,13 +75,8 @@ public final class HdmiCecService extends SystemService { @Override public void onStart() { - mNativePtr = nativeInit(this); - if (mNativePtr != 0) { - // TODO: Consider using a dedicated, configurable identifier for OSD name, maybe from - // Settings. It should be ASCII only, not a very long one (limited to 15 chars). - setOsdNameLocked(Build.MODEL); - publishBinderService(Context.HDMI_CEC_SERVICE, new BinderService()); - } + // Stop publishing the service. Soon to be deprecated. + Log.w(TAG, "In transition to HdmiControlService. May not work."); } /** diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 072b97f..83225f0 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -140,8 +140,7 @@ public final class HdmiControlService extends SystemService { Slog.i(TAG, "Device does not support MHL-control."); } - // TODO: Publish the BinderService - // publishBinderService(Context.HDMI_CONTROL_SERVICE, new BinderService()); + publishBinderService(Context.HDMI_CONTROL_SERVICE, new BinderService()); } /** diff --git a/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp b/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp index c6de676..a734026 100644 --- a/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp +++ b/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp @@ -240,13 +240,6 @@ void HdmiCecController::onReceived(const hdmi_event_t* event, void* arg) { var = env->GetMethodID(clazz, methodName, methodDescriptor); \ LOG_FATAL_IF(! var, "Unable to find method " methodName); -// TODO: replace above code with following once -// replace old HdmiCecService with HdmiControlService -#undef HDMI_CEC_HARDWARE_MODULE_ID -#define HDMI_CEC_HARDWARE_MODULE_ID "hdmi_cec_module" -#undef HDMI_CEC_HARDWARE_INTERFACE -#define HDMI_CEC_HARDWARE_INTERFACE "hdmi_cec_module_hw_if" - static jlong nativeInit(JNIEnv* env, jclass clazz, jobject callbacksObj, jobject messageQueueObj) { int err; -- cgit v1.1