From 08f1ab02d6de42756825a2dfa7027137ff959bd8 Mon Sep 17 00:00:00 2001 From: Jinsuk Kim Date: Mon, 13 Oct 2014 10:38:16 +0900 Subject: [PATCH] CEC: Do not publish the service if native/HAL is not ready This helps detect the issue sooner by checking the availability of the service and avoid crashing at a later point. Bug: 17897529 Change-Id: Iab0eeffb00221e5a7e6e36d446eeef7c92da1f82 --- .../core/java/com/android/server/hdmi/HdmiControlService.java | 1 + .../core/java/com/android/server/tv/TvInputHardwareManager.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index d73f8fbc5db60..c906c3cda189a 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -303,6 +303,7 @@ public final class HdmiControlService extends SystemService { } } else { Slog.i(TAG, "Device does not support HDMI-CEC."); + return; } mMhlController = HdmiMhlControllerStub.create(this); diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java index 7d72a2e0c9b09..44e4ad10c353d 100644 --- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java +++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java @@ -122,6 +122,8 @@ class TvInputHardwareManager implements TvInputHal.Callback { } catch (RemoteException e) { Slog.w(TAG, "Error registering listeners to HdmiControlService:", e); } + } else { + Slog.w(TAG, "HdmiControlService is not available"); } } }