Merge "CEC: Filter certain message arguments from logging" into rvc-dev am: 3002b11fb6 (247c43ac) · Commits · e / os / android_frameworks_base

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

+22 −2

Original line number	Original line	Diff line number	Diff line
	@@ -115,10 +115,14 @@ public final class HdmiCecMessage {
	s.append(String.format("<%s> %X%X:%02X",		s.append(String.format("<%s> %X%X:%02X",
	opcodeToString(mOpcode), mSource, mDestination, mOpcode));		opcodeToString(mOpcode), mSource, mDestination, mOpcode));
	if (mParams.length > 0) {		if (mParams.length > 0) {
			if (filterMessageParameters(mOpcode)) {
			s.append(String.format(" <Redacted len=%d>", mParams.length));
			} else {
	for (byte data : mParams) {		for (byte data : mParams) {
	s.append(String.format(":%02X", data));		s.append(String.format(":%02X", data));
	}		}
	}		}
			}
	return s.toString();		return s.toString();
	}		}

	@@ -270,5 +274,21 @@ public final class HdmiCecMessage {
	return String.format("Opcode: %02X", opcode);		return String.format("Opcode: %02X", opcode);
	}		}
	}		}

			private static boolean filterMessageParameters(int opcode) {
			switch (opcode) {
			case Constants.MESSAGE_USER_CONTROL_PRESSED:
			case Constants.MESSAGE_USER_CONTROL_RELEASED:
			case Constants.MESSAGE_SET_OSD_NAME:
			case Constants.MESSAGE_SET_OSD_STRING:
			case Constants.MESSAGE_VENDOR_COMMAND:
			case Constants.MESSAGE_VENDOR_REMOTE_BUTTON_DOWN:
			case Constants.MESSAGE_VENDOR_REMOTE_BUTTON_UP:
			case Constants.MESSAGE_VENDOR_COMMAND_WITH_ID:
			return true;
			default:
			return false;
			}
			}
	}		}