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

Commit d363d421 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by android-build-merger
Browse files

Merge "CEC: Remove listener records only if they are currently used" into nyc-dev am: 23cd9dab 

am: 410f39c8

* commit '410f39c8':
  CEC: Remove listener records only if they are currently used

Change-Id: Id4a7019e9262b16b54c011d50ecab348d437c954
parents 3f3dc2c7 410f39c8

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

+6 −2
Original line number Diff line number Diff line
@@ -1189,10 +1189,12 @@ public final class HdmiControlService extends SystemService { 
        @Override

        public void binderDied() {

            synchronized (mLock) {

                if (mRecordListenerRecord == this) {

                    mRecordListenerRecord = null;

                }

            }

        }

    }



    private void enforceAccessPermission() {

        getContext().enforceCallingOrSelfPermission(PERMISSION, TAG);
@@ -1813,10 +1815,12 @@ public final class HdmiControlService extends SystemService { 
        @Override

        public void binderDied() {

            synchronized (mLock) {

                if (mInputChangeListenerRecord == this) {

                    mInputChangeListenerRecord = null;

                }

            }

        }

    }



    private void setInputChangeListener(IHdmiInputChangeListener listener) {

        synchronized (mLock) {