Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d767e6f authored by Nick Kralevich's avatar Nick Kralevich
Browse files

Revert "UsbDeviceManager: fix b/21429947 regression" 

This causes various problems with our testing infrastructure.

This reverts commit b210026e.

Bug: 22447614
Bug: 21429947
Change-Id: I57623e3d993e65b6ad89e7a7d28e9575cf638994
parent b210026e

services/usb/java/com/android/server/usb/UsbDeviceManager.java

+4 −1
Original line number Diff line number Diff line
@@ -49,8 +49,10 @@ import com.android.internal.util.IndentingPrintWriter; 
import com.android.server.FgThread;



import java.io.File;

import java.io.FileDescriptor;

import java.io.FileNotFoundException;

import java.io.IOException;

import java.io.PrintWriter;

import java.util.HashMap;

import java.util.LinkedList;

import java.util.List;
@@ -805,7 +807,8 @@ public class UsbDeviceManager { 
        }



        private String getDefaultFunctions() {

            return mAdbEnabled ? UsbManager.USB_FUNCTION_ADB : UsbManager.USB_FUNCTION_MTP;

            return SystemProperties.get(USB_PERSISTENT_CONFIG_PROPERTY,

                    UsbManager.USB_FUNCTION_ADB);

        }



        public void dump(IndentingPrintWriter pw) {