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

Commit 410f39c8 authored by Donghyun Cho's avatar Donghyun Cho Committed by android-build-merger
Browse files

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

am: 23cd9dab

* commit '23cd9dab':
  CEC: Remove listener records only if they are currently used

Change-Id: I78186db4ad9369dfe90969bbbb680cd463e642d5
parents 1575c020 23cd9dab

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) {