diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
index 1ebb722b022f..92e0845012de 100755
--- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java
+++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
@@ -1266,12 +1266,14 @@ class TvInputHardwareManager implements TvInputHal.Callback {
                     if (inputId != null) {
                         if (connection.updateCableConnectionStatusLocked(cableConnectionStatus)) {
                             if (previousCableConnectionStatus != connection.getInputStateLocked()) {
-                                mListener.onStateChanged(inputId, connection.getInputStateLocked());
+                                mHandler.obtainMessage(ListenerHandler.STATE_CHANGED,
+                                    connection.getInputStateLocked(), 0, inputId).sendToTarget();
                             }
                         } else {
                             if ((previousConfigsLength == 0)
                                     != (connection.getConfigsLengthLocked() == 0)) {
-                                mListener.onStateChanged(inputId, connection.getInputStateLocked());
+                                mHandler.obtainMessage(ListenerHandler.STATE_CHANGED,
+                                    connection.getInputStateLocked(), 0, inputId).sendToTarget();
                             }
                         }
                     }