Revert "Dynamically enable multi-peripheral mode"

This reverts commit f58eb1d14fc386e1634bbe18ec1c7f953fa590eb.

CRs-Fixed: 3721555
Change-Id: I47d135ddcc6cc7bac1bae4461690b7c3b82bda20

1 files changed, 1 insertions, 6 deletions

diff --git a/services/usb/java/com/android/server/usb/UsbAlsaManager.java b/services/usb/java/com/android/server/usb/UsbAlsaManager.java
index de430c2338e3..17c354a8a80e 100644
--- a/services/usb/java/com/android/server/usb/UsbAlsaManager.java
+++ b/services/usb/java/com/android/server/usb/UsbAlsaManager.java
@@ -38,7 +38,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
-import android.os.SystemProperties;
 
 /**
  * UsbAlsaManager manages USB audio and MIDI devices.
@@ -49,7 +48,7 @@ public final class UsbAlsaManager {
 
     // Flag to turn on/off multi-peripheral select mode
     // Set to true to have single-device-only mode
-    private static boolean mIsSingleMode = true;
+    private static final boolean mIsSingleMode = true;
 
     private static final String ALSA_DIRECTORY = "/dev/snd/";
 
@@ -138,10 +137,6 @@ public final class UsbAlsaManager {
             Slog.d(TAG, "selectAlsaDevice() " + alsaDevice);
         }
 
-        if ("true".equals(SystemProperties.get("vendor.audio.gaming.enabled", "false"))) {
-            mIsSingleMode = false;
-        }
-
         // This must be where an existing USB audio device is deselected.... (I think)
         if (mIsSingleMode && mSelectedDevice != null) {
             deselectAlsaDevice();