diff options
Diffstat (limited to 'services')
3 files changed, 3 insertions, 16 deletions
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; |