Merge "Add additional logging to listeners API" (a2b99236) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -2307,6 +2307,7 @@ public class HdmiControlService extends SystemService {

		@Override
		public void setCecSettingStringValue(String name, String value) {
		Slog.i(TAG, "Setting '" + name + "' to '" + value + "'.");
		initBinderCall();
		long token = Binder.clearCallingIdentity();
		try {
		@@ -2329,6 +2330,7 @@ public class HdmiControlService extends SystemService {

		@Override
		public void setCecSettingIntValue(String name, int value) {
		Slog.i(TAG, "Setting '" + name + "' to '" + value + "'.");
		initBinderCall();
		long token = Binder.clearCallingIdentity();
		try {
		@@ -3493,6 +3495,7 @@ public class HdmiControlService extends SystemService {
		new HdmiCecConfig.SettingChangeListener() {
		@Override
		public void onChange(String name) {
		Slog.i(TAG, "Change listener fired for '" + name + "' setting.");
		synchronized (mLock) {
		if (!mHdmiCecSettingChangeListenerRecords.containsKey(name)) {
		return;
		@@ -3512,6 +3515,7 @@ public class HdmiControlService extends SystemService {
		mHdmiCecConfig.registerChangeListener(name, mSettingChangeListener);
		}
		mHdmiCecSettingChangeListenerRecords.get(name).register(listener);
		Slog.i(TAG, "Added change listener for '" + name + "' setting.");
		}
		}

		@@ -3525,12 +3529,14 @@ public class HdmiControlService extends SystemService {
		if (mHdmiCecSettingChangeListenerRecords.get(name).getRegisteredCallbackCount() == 0) {
		mHdmiCecSettingChangeListenerRecords.remove(name);
		mHdmiCecConfig.removeChangeListener(name, mSettingChangeListener);
		Slog.i(TAG, "Removed change listener for '" + name + "' setting.");
		}
		}
		}

		private void invokeCecSettingChangeListenerLocked(String name,
		final IHdmiCecSettingChangeListener listener) {
		Slog.i(TAG, "Listener.onChange() invoked for '" + name + "' setting.");
		try {
		listener.onChange(name);
		} catch (RemoteException e) {