drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '11473332b4df78610ebb903e255d69ab35e5bf59':
  MtpServer: Do not attempt to stop MTP if it has not been started
This commit is contained in:
Mike Lockwood
2011-03-17 07:26:44 -07:00
committed by Android Git Automerger
parent 4502636629 11473332b4
commit c97022e7ac
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media/java/android/mtp/MtpServer.java
View File

@ -24,6 +24,9 @@ import android.util.Log;
*/ */
public class MtpServer { public class MtpServer {
private final Object mLock = new Object();
private boolean mStarted;
private static final String TAG = "MtpServer"; private static final String TAG = "MtpServer";
static { static {
@ -35,11 +38,19 @@ public class MtpServer {
} }
public void start() { public void start() {
native_start(); synchronized (mLock) {
native_start();
mStarted = true;
}
} }
public void stop() { public void stop() {
native_stop(); synchronized (mLock) {
if (mStarted) {
native_stop();
mStarted = false;
}
}
} }
public void sendObjectAdded(int handle) { public void sendObjectAdded(int handle) {