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

2011-03-17 07:24:12 -07:00
parent 8f5cab8b31 a3f8514492
commit 11473332b4
1 changed files with 13 additions and 2 deletions
--- a/media/java/android/mtp/MtpServer.java
+++ b/media/java/android/mtp/MtpServer.java
@@ -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() {
-        native_start();
+        synchronized (mLock) {
+            native_start();
+            mStarted = true;
+        }
    }

    public void stop() {
-        native_stop();
+        synchronized (mLock) {
+            if (mStarted) {
+                native_stop();
+                mStarted = false;
+            }
+        }
    }

    public void sendObjectAdded(int handle) {