commit 96e6ddb24dd149aa991ef007a394ea9592066d14
author John Hoford <hoford@google.com> Thu Oct 10 08:59:17 2013 -0700
committer John Hoford <hoford@google.com> Thu Oct 10 09:00:43 2013 -0700
tree fb1b83e7f651a6edaf0493fe1d57a6464a78e8ae
parent fb1884f63beb3ab4c94b09aea91b5ad501bc6af6

fix Gallery crashes with empty PTP device

bug:11152999
Change-Id: I70e4787dc46c0e948712ea4530b8110c36603dfa

src/com/android/gallery3d/ingest/MtpDeviceIndex.java

diff --git a/src/com/android/gallery3d/ingest/MtpDeviceIndex.java b/src/com/android/gallery3d/ingest/MtpDeviceIndex.java
index d30f94a..fed851e 100644
--- a/src/com/android/gallery3d/ingest/MtpDeviceIndex.java
+++ b/src/com/android/gallery3d/ingest/MtpDeviceIndex.java
@@ -267,6 +267,9 @@
                 break;
             }
         }
+        if (mBuckets.length == 0 || mUnifiedLookupIndex.length == 0) {
+            return -1;
+        }
         int mappedPos = mBuckets[bucketNumber].unifiedStartIndex
                 + position - mBuckets[bucketNumber].itemsStartIndex;
         if (order == SortOrder.Descending) {
@@ -283,6 +286,9 @@
             return bucket.itemsStartIndex + position - 1 - bucket.unifiedStartIndex;
         } else {
             int zeroIndex = mUnifiedLookupIndex.length - 1 - position;
+            if (mBuckets.length == 0 || mUnifiedLookupIndex.length == 0) {
+                return -1;
+            }
             DateBucket bucket = mBuckets[mUnifiedLookupIndex[zeroIndex]];
             if (bucket.unifiedEndIndex == zeroIndex) zeroIndex--;
             return mMtpObjects.length - 1 - bucket.itemsStartIndex