Merge "CEC: Do not publish the service if native/HAL is not ready" into lmp-mr1-dev

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);

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");
             }
         }
     }