diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-01-25 16:20:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-25 16:20:50 -0800 |
| commit | 501e52f09d555cc27c637846a897b4903a116678 (patch) | |
| tree | ab6d8e4726b146bbd544f8fc95535e37c1a9ddd4 /media/java/android/mtp | |
| parent | 7ae6dac845eca9b1f1ded4567d8ef90501ac7ae4 (diff) | |
| parent | 7fadb5e77fd079c3a6c5eeae1ae81a487864b129 (diff) | |
| download | frameworks_base-501e52f09d555cc27c637846a897b4903a116678.zip frameworks_base-501e52f09d555cc27c637846a897b4903a116678.tar.gz frameworks_base-501e52f09d555cc27c637846a897b4903a116678.tar.bz2 | |
am 7fadb5e7: am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb
* commit '7fadb5e77fd079c3a6c5eeae1ae81a487864b129':
MTP: Fix race conditions in MtpServer JNI code
Diffstat (limited to 'media/java/android/mtp')
| -rw-r--r-- | media/java/android/mtp/MtpPropertyGroup.java | 2 | ||||
| -rw-r--r-- | media/java/android/mtp/MtpServer.java | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/media/java/android/mtp/MtpPropertyGroup.java b/media/java/android/mtp/MtpPropertyGroup.java index fff96c7..57e2304 100644 --- a/media/java/android/mtp/MtpPropertyGroup.java +++ b/media/java/android/mtp/MtpPropertyGroup.java @@ -282,7 +282,7 @@ class MtpPropertyGroup { } MtpPropertyList getPropertyList(int handle, int format, int depth, int storageID) { - Log.d(TAG, "getPropertyList handle: " + handle + " format: " + format + " depth: " + depth); + //Log.d(TAG, "getPropertyList handle: " + handle + " format: " + format + " depth: " + depth); if (depth > 1) { // we only support depth 0 and 1 // depth 0: single object, depth 1: immediate children diff --git a/media/java/android/mtp/MtpServer.java b/media/java/android/mtp/MtpServer.java index 2e69373..d433887 100644 --- a/media/java/android/mtp/MtpServer.java +++ b/media/java/android/mtp/MtpServer.java @@ -54,12 +54,8 @@ public class MtpServer { native_set_ptp_mode(usePtp); } - // used by the JNI code - private int mNativeContext; - private native final void native_setup(MtpDatabase database, String storagePath, long reserveSpace); - private native final void native_finalize(); private native final void native_start(); private native final void native_stop(); private native final void native_send_object_added(int handle); |