Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ea712f4 authored by Jinsuk Kim's avatar Jinsuk Kim Committed by Android (Google) Code Review
Browse files

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

parents 62d8c4b0 08f1ab02

services/core/java/com/android/server/hdmi/HdmiControlService.java

+1 −0
Original line number Diff line number Diff line
@@ -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

+2 −0
Original line number Diff line number Diff line
@@ -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");

            }

        }

    }