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

Commit 69e671c6 authored by Austin Shin's avatar Austin Shin Committed by Automerger Merge Worker
Browse files

Merge "Fix onStateChanged issue." am: 61c3d559 am: f3b6f05c 

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

Change-Id: I7f7bb85bf9d59acc9a0730da01b735c3d8751045
parents d25abeab f3b6f05c

services/core/java/com/android/server/tv/TvInputHardwareManager.java

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

                            }

                        }

                    }