From baa97045b1e3d22246979ee5f265b84ee732063e Mon Sep 17 00:00:00 2001
From: Amy <amyjojo@google.com>
Date: Fri, 22 Mar 2019 16:33:48 -0700
Subject: [PATCH] Add a port id validation before handling the manual port
 select.

Test: manual
Change-Id: I3313a5fd4c09888d5f00e6feaa0e039bd84e6586
(cherry picked from commit de489cfe3ecb92e3889e88ec62e5cabfdf9d4d22)
---
 .../android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
index 2026957b6c44c..dcb3e16a6e3ab 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
@@ -970,7 +970,10 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
     @ServiceThreadOnly
     void doManualPortSwitching(int portId, IHdmiControlCallback callback) {
         assertRunOnServiceThread();
-        // TODO: validate port ID
+        if (!mService.isValidPortId(portId)) {
+            invokeCallback(callback, HdmiControlManager.RESULT_TARGET_NOT_AVAILABLE);
+            return;
+        }
         if (portId == getLocalActivePort()) {
             invokeCallback(callback, HdmiControlManager.RESULT_SUCCESS);
             return;