commit 186d372cba13abc2c86206d4c3c43fefe8b20a3c
author Marvin Ramin <marvinramin@google.com> Wed Sep 09 10:56:28 2020 +0200
committer Marvin Ramin <marvinramin@google.com> Wed Sep 23 13:27:09 2020 +0000
tree dd3617be9cb0b6212d9ff109d4eabd1fc4f3f3b3
parent 104d2f92b3911576c284ddb0adf78148359883d2

Reconnect CEC HAL callback

When the HAL service crashes, reconnect to the HAL with retries and
ensure that the callback is reconnected as well.

Bug: 167649125
Test: make; flash; kill cec hal process and ensure CEC messages are
still sent and received afterwards

Change-Id: I5686f5dcf50c8f8bf67533596c39ac697f1e7263

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

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecController.java b/services/core/java/com/android/server/hdmi/HdmiCecController.java
index 66a01c4..8b655c6 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecController.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecController.java
@@ -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;
@@ -712,6 +714,7 @@
         private IHdmiCec mHdmiCec;
         private final Object mLock = new Object();
         private int mPhysicalAddress = INVALID_PHYSICAL_ADDRESS;
+        @Nullable private HdmiCecCallback mCallback;
 
         @Override
         public String nativeInit() {
@@ -720,7 +723,7 @@
 
         boolean connectToHal() {
             try {
-                mHdmiCec = IHdmiCec.getService();
+                mHdmiCec = IHdmiCec.getService(true);
                 try {
                     mHdmiCec.linkToDeath(this, HDMI_CEC_HAL_DEATH_COOKIE);
                 } catch (RemoteException e) {
@@ -734,7 +737,8 @@
         }
 
         @Override
-        public void setCallback(HdmiCecCallback callback) {
+        public void setCallback(@NonNull HdmiCecCallback callback) {
+            mCallback = callback;
             try {
                 mHdmiCec.setCallback(callback);
             } catch (RemoteException e) {
@@ -874,6 +878,10 @@
             if (cookie == HDMI_CEC_HAL_DEATH_COOKIE) {
                 HdmiLogger.error(TAG, "Service died cokkie : " + cookie + "; reconnecting");
                 connectToHal();
+                // Reconnect the callback
+                if (mCallback != null) {
+                    setCallback(mCallback);
+                }
             }
         }