commit e1b47ee2a160a76c7303b3172316a34f59fe6f58
author Eric Laurent <elaurent@google.com> Thu Dec 07 15:30:30 2023 +0100
committer Eric Laurent <elaurent@google.com> Thu Dec 07 15:30:30 2023 +0100
tree 8d5f11f482c328ec73bb3b3c52da2a852011dff9
parent 8bc28f86428afdf68ffbd56557aa15bfc0c39bc6

AudioDeviceInventory: do not use immutable device lists

Do not add immutable AudioDeviceAttributes lists to strategy
and capture preset preferrences maps as these lists can be
modified after creation.

Bug: 307161477
Test: repro steps in bug.
Change-Id: I746ff492118bcae4a3ff46647d1ed1f9a63e7ba4

services/core/java/com/android/server/audio/AudioDeviceInventory.java

diff --git a/services/core/java/com/android/server/audio/AudioDeviceInventory.java b/services/core/java/com/android/server/audio/AudioDeviceInventory.java
index e503f1f..bb16ed6 100644
--- a/services/core/java/com/android/server/audio/AudioDeviceInventory.java
+++ b/services/core/java/com/android/server/audio/AudioDeviceInventory.java
@@ -1384,7 +1384,7 @@
             } else {
                 status = addOp.deviceRoleAction(useCase, role, devices);
                 if (status == AudioSystem.SUCCESS) {
-                    rolesMap.put(key, devices);
+                    rolesMap.put(key, new ArrayList(devices));
                 }
             }
             return status;