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

Commit ffc45b7d authored by Benoit Goby's avatar Benoit Goby Committed by Android (Google) Code Review
Browse files

Merge "UsbDebuggingManager: Fix restart when toggling USB debugging" into jb-mr1-dev

parents f404d102 509bf2d2

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

+3 −2
Original line number Diff line number Diff line
@@ -53,16 +53,15 @@ public class UsbDebuggingManager implements Runnable { 
    private final int BUFFER_SIZE = 4096;



    private final Context mContext;

    private final Thread mThread;

    private final Handler mHandler;

    private final HandlerThread mHandlerThread;

    private Thread mThread;

    private boolean mAdbEnabled = false;

    private String mFingerprints;

    private LocalSocket mSocket = null;

    private OutputStream mOutputStream = null;



    public UsbDebuggingManager(Context context) {

        mThread = new Thread(this);

        mHandlerThread = new HandlerThread("UsbDebuggingHandler");

        mHandlerThread.start();

        mHandler = new UsbDebuggingHandler(mHandlerThread.getLooper());
@@ -165,6 +164,7 @@ public class UsbDebuggingManager implements Runnable { 


                    mAdbEnabled = true;



                    mThread = new Thread(UsbDebuggingManager.this);

                    mThread.start();



                    break;
@@ -181,6 +181,7 @@ public class UsbDebuggingManager implements Runnable { 
                    } catch (Exception ex) {

                    }



                    mThread = null;

                    mOutputStream = null;

                    mSocket = null;

                    break;