Fix 4975579 PTP: Unable to load the thumbnails while connected to camera

There's a deadlock in threadpool. The fix has been verified.

Change-Id: I000527f55fc2a3777bd4bb06817a9967b2f50488

1 files changed, 2 insertions, 9 deletions

diff --git a/src/com/android/gallery3d/data/MtpImage.java b/src/com/android/gallery3d/data/MtpImage.java
index e0e5481d9..218f70483 100644
--- a/src/com/android/gallery3d/data/MtpImage.java
+++ b/src/com/android/gallery3d/data/MtpImage.java
@@ -78,8 +78,8 @@ public class MtpImage extends MediaItem {
     public Job<Bitmap> requestImage(int type) {
         return new Job<Bitmap>() {
             public Bitmap run(JobContext jc) {
-                GetThumbnailBytes job = new GetThumbnailBytes();
-                byte[] thumbnail = mThreadPool.submit(job).get();
+                byte[] thumbnail = mMtpContext.getMtpClient().getThumbnail(
+                        UsbDevice.getDeviceName(mDeviceId), mObjectId);
                 if (thumbnail == null) {
                     Log.w(TAG, "decoding thumbnail failed");
                     return null;
@@ -116,13 +116,6 @@ public class MtpImage extends MediaItem {
         return SUPPORT_FULL_IMAGE | SUPPORT_IMPORT;
     }
 
-    private class GetThumbnailBytes implements Job<byte[]> {
-        public byte[] run(JobContext jc) {
-            return mMtpContext.getMtpClient().getThumbnail(
-                    UsbDevice.getDeviceName(mDeviceId), mObjectId);
-        }
-    }
-
     public void updateContent(MtpObjectInfo info) {
         if (mObjectId != info.getObjectHandle() || mDateTaken != info.getDateCreated()) {
             mObjectId = info.getObjectHandle();