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

Commit 11473332 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1

parents 8f5cab8b a3f85144

media/java/android/mtp/MtpServer.java

+13 −2
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ import android.util.Log; 
 */

public class MtpServer {



    private final Object mLock = new Object();

    private boolean mStarted;



    private static final String TAG = "MtpServer";



    static {
@@ -35,11 +38,19 @@ public class MtpServer { 
    }



    public void start() {

        synchronized (mLock) {

            native_start();

            mStarted = true;

        }

    }



    public void stop() {

        synchronized (mLock) {

            if (mStarted) {

                native_stop();

                mStarted = false;

            }

        }

    }



    public void sendObjectAdded(int handle) {