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

Commit c01e201f authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT... 

am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread

* commit '61c1bb4f':
  UsbService: Remove stack-trace message during boot. DO NOT MERGE
parents fc88f94f 61c1bb4f

services/java/com/android/server/UsbService.java

+9 −4
Original line number Diff line number Diff line
@@ -134,14 +134,17 @@ class UsbService { 
        mContext = context;

        init();  // set initial status



        if (mConfiguration >= 0) {

            mUEventObserver.startObserving(USB_CONNECTED_MATCH);

            mUEventObserver.startObserving(USB_CONFIGURATION_MATCH);

            mUEventObserver.startObserving(USB_FUNCTIONS_MATCH);

        }

    }



    private final void init() {

        char[] buffer = new char[1024];



        mConfiguration = -1;

        try {

            FileReader file = new FileReader(USB_CONNECTED_PATH);

            int len = file.read(buffer, 0, 1024);
@@ -153,10 +156,12 @@ class UsbService { 
            file.close();

            mConfiguration = Integer.valueOf((new String(buffer, 0, len)).trim());

        } catch (FileNotFoundException e) {

            Slog.w(TAG, "This kernel does not have USB configuration switch support");

            Slog.i(TAG, "This kernel does not have USB configuration switch support");

        } catch (Exception e) {

            Slog.e(TAG, "" , e);

        }

        if (mConfiguration < 0)

            return;



        try {

            File[] files = new File(USB_COMPOSITE_CLASS_PATH).listFiles();