commit | 08f1ab02d6de42756825a2dfa7027137ff959bd8 | [log] [tgz] |
---|---|---|
author | Jinsuk Kim <jinsukkim@google.com> | Mon Oct 13 10:38:16 2014 +0900 |
committer | Jinsuk Kim <jinsukkim@google.com> | Mon Oct 13 10:44:50 2014 +0900 |
tree | 4aac28e97aa913e09d0bacb2d334fc361ecd1c5e | |
parent | 6d39d66900744afbd0d4388f1a14c9b47d1f1d1a [diff] |
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
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index d73f8fb..c906c3c 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 @@ } } 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 7d72a2e..44e4ad1 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 @@ } catch (RemoteException e) { Slog.w(TAG, "Error registering listeners to HdmiControlService:", e); } + } else { + Slog.w(TAG, "HdmiControlService is not available"); } } }