am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev

import com.android.server.FgThread;

import com.android.server.FgThread;

import java.io.File;

import java.io.File;

import java.io.FileDescriptor;

import java.io.FileNotFoundException;

import java.io.FileNotFoundException;

import java.io.IOException;

import java.io.IOException;

import java.io.PrintWriter;

import java.util.HashMap;

import java.util.HashMap;

import java.util.LinkedList;

import java.util.LinkedList;

import java.util.List;

import java.util.List;

        }

        }

        private String getDefaultFunctions() {

        private String getDefaultFunctions() {

            return SystemProperties.get(USB_PERSISTENT_CONFIG_PROPERTY,

            return mAdbEnabled ? UsbManager.USB_FUNCTION_ADB : UsbManager.USB_FUNCTION_MTP;

                    UsbManager.USB_FUNCTION_ADB);

        }

        }

        public void dump(IndentingPrintWriter pw) {

        public void dump(IndentingPrintWriter pw) {