Merge "Check the validity of the port id of HdmiCecMessage only in TV." into lmp-dev (3ae16dda) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -243,12 +243,17 @@ public final class HdmiCecMessageValidator {
		}

		private boolean isValidPhysicalAddress(byte[] params, int offset) {
		// TODO: Add more logic like validating 1.0.1.0.

		if (!mService.isTvDevice()) {
		// If the device is not TV, we can't convert path to port-id, so stop here.
		return true;
		}
		int path = HdmiUtils.twoBytesToInt(params, offset);
		int portId = mService.pathToPortId(path);
		if (portId == Constants.INVALID_PORT_ID) {
		return false;
		}
		// TODO: Add more logic like validating 1.0.1.0.
		return true;
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -981,10 +981,6 @@ public final class HdmiControlService extends SystemService {
		}
		}

		private boolean isTvDevice() {
		return tv() != null;
		}

		@Override
		public void setProhibitMode(final boolean enabled) {
		enforceAccessPermission();
		@@ -1328,6 +1324,10 @@ public final class HdmiControlService extends SystemService {
		return (HdmiCecLocalDeviceTv) mCecController.getLocalDevice(HdmiCecDeviceInfo.DEVICE_TV);
		}

		boolean isTvDevice() {
		return tv() != null;
		}

		private HdmiCecLocalDevicePlayback playback() {
		return (HdmiCecLocalDevicePlayback)
		mCecController.getLocalDevice(HdmiCecDeviceInfo.DEVICE_PLAYBACK);