commit 01f10fdfc9eb564a1af08c86fdf88a8fd94c1bc9
author Paul Colta <donpaul@google.com> Wed Sep 18 18:56:56 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 18 18:56:56 2024 +0000
tree 7dbf98e8c7f6499078ca2150ec1840814e27c33a
parent 6f9393e11dc4c4fa9fa60f906621b2cc0f73bd6e
parent a6f234e1a096454efe83240e6eb666ddceffe719

Merge "HDMI: Fix possible IndexOutOfBoundsException in HdmiControlService" into main

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

diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index ac75ef7..8e41d18 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -1688,7 +1688,11 @@
     private void sendCecCommandWithRetries(HdmiCecMessage command,
             @Nullable SendMessageCallback callback) {
         assertRunOnServiceThread();
-        HdmiCecLocalDevice localDevice = getAllCecLocalDevices().get(0);
+        List<HdmiCecLocalDevice> devices = getAllCecLocalDevices();
+        if (devices.isEmpty()) {
+            return;
+        }
+        HdmiCecLocalDevice localDevice = devices.get(0);
         if (localDevice != null) {
             sendCecCommandWithoutRetries(command, new SendMessageCallback() {
                 @Override