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

Commit b596de1e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reconnect CEC HAL callback" am: f1df6bf3 am: 70c1c706 am:... 

Merge "Reconnect CEC HAL callback" am: f1df6bf3 am: 70c1c706 am: 339cefd3 am: d609fa5d am: 4a4aa06e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422871

Change-Id: I43fa9542259988e63872323cf19f23cfee510102
parents 0a016bca 4a4aa06e

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

+10 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.server.hdmi;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.hardware.hdmi.HdmiPortInfo;

import android.hardware.tv.cec.V1_0.CecMessage;

import android.hardware.tv.cec.V1_0.HotplugEvent;
@@ -774,6 +776,7 @@ final class HdmiCecController { 
        private IHdmiCec mHdmiCec;

        private final Object mLock = new Object();

        private int mPhysicalAddress = INVALID_PHYSICAL_ADDRESS;

        @Nullable private HdmiCecCallback mCallback;



        @Override

        public String nativeInit() {
@@ -782,7 +785,7 @@ final class HdmiCecController { 


        boolean connectToHal() {

            try {

                mHdmiCec = IHdmiCec.getService();

                mHdmiCec = IHdmiCec.getService(true);

                try {

                    mHdmiCec.linkToDeath(this, HDMI_CEC_HAL_DEATH_COOKIE);

                } catch (RemoteException e) {
@@ -796,7 +799,8 @@ final class HdmiCecController { 
        }



        @Override

        public void setCallback(HdmiCecCallback callback) {

        public void setCallback(@NonNull HdmiCecCallback callback) {

            mCallback = callback;

            try {

                mHdmiCec.setCallback(callback);

            } catch (RemoteException e) {
@@ -936,6 +940,10 @@ final class HdmiCecController { 
            if (cookie == HDMI_CEC_HAL_DEATH_COOKIE) {

                HdmiLogger.error("Service died cookie : " + cookie + "; reconnecting");

                connectToHal();

                // Reconnect the callback

                if (mCallback != null) {

                    setCallback(mCallback);

                }

            }

        }