Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I07a0d65037c9aa250edebbccb8e09f63894fc2c9
Change-Id: Ibc59723a780e827a7d1a1275ddbb68db38cae22a

src/com/android/musicfx/ActivityMusic.java

diff --git a/src/com/android/musicfx/ActivityMusic.java b/src/com/android/musicfx/ActivityMusic.java
index d275a85..68b0001 100644
--- a/src/com/android/musicfx/ActivityMusic.java
+++ b/src/com/android/musicfx/ActivityMusic.java
@@ -251,7 +251,7 @@
             if (deviceInfo == null) {
                 continue;
             }
-            final int type = deviceInfo.getType();
+            final @AudioDeviceInfo.AudioDeviceType int type = deviceInfo.getType();
             if (HEADSET_DEVICE_TYPES.contains(type)) {
                 Log.v(TAG, " at least a HeadSet device type " + type + " connected");
                 return true;