Merge pull request #8662 from joakimzhang:dev-v2

PiperOrigin-RevId: 361029604

Merge pull request #8662 from joakimzhang:dev-v2
PiperOrigin-RevId: 361029604
83d7a3c1 · Ian Baker · 4df74102 · dc814fc3 · 83d7a3c1
Commit 83d7a3c1 authored Mar 12, 2021 by Ian Baker
Showing with 2 additions and 1 deletions
library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
--- 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));
  }
 }