Merge "CEC: Remove volume control changes from service thread" into rvc-dev... (cad9b62d) · Commits · e / os / android_frameworks_base

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

+1 −9

Original line number	Diff line number	Diff line
		@@ -2195,13 +2195,7 @@ public class HdmiControlService extends SystemService {
		@Override
		public void setHdmiCecVolumeControlEnabled(final boolean isHdmiCecVolumeControlEnabled) {
		enforceAccessPermission();
		runOnServiceThread(new Runnable() {
		@Override
		public void run() {
		HdmiControlService.this.setHdmiCecVolumeControlEnabled(
		isHdmiCecVolumeControlEnabled);
		}
		});
		HdmiControlService.this.setHdmiCecVolumeControlEnabled(isHdmiCecVolumeControlEnabled);
		}

		@Override
		@@ -3002,7 +2996,6 @@ public class HdmiControlService extends SystemService {
		}

		void setHdmiCecVolumeControlEnabled(boolean isHdmiCecVolumeControlEnabled) {
		assertRunOnServiceThread();
		synchronized (mLock) {
		mHdmiCecVolumeControlEnabled = isHdmiCecVolumeControlEnabled;

		@@ -3018,7 +3011,6 @@ public class HdmiControlService extends SystemService {
		}

		boolean isHdmiCecVolumeControlEnabled() {
		assertRunOnServiceThread();
		synchronized (mLock) {
		return mHdmiCecVolumeControlEnabled;
		}