Merge "CEC: Remove listener records only if they are currently used" into nyc-dev (23cd9dab) · Commits · e / os / android_frameworks_base

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