From db60db70fca71ccf99034a9cace0939b5f858df6 Mon Sep 17 00:00:00 2001
From: Ian Baker <ibaker@google.com>
Date: Fri, 12 Mar 2021 10:38:36 +0000
Subject: [PATCH] Merge pull request #8662 from joakimzhang:dev-v2

PiperOrigin-RevId: 361029604
---
 .../com/google/android/exoplayer2/audio/AudioCapabilities.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
index 4ec8e518b3..9dee990905 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
@@ -155,6 +155,7 @@ public final class AudioCapabilities {
   }
 
   private static boolean deviceMaySetExternalSurroundSoundGlobalSetting() {
-    return Util.SDK_INT >= 17 && "Amazon".equals(Util.MANUFACTURER);
+    return Util.SDK_INT >= 17
+        && ("Amazon".equals(Util.MANUFACTURER) || "Xiaomi".equals(Util.MANUFACTURER));
   }
 }