commit 0a8bfd1b3b81ce50bb38a54644554b95db7744b0
author Mike Lockwood <lockwood@android.com> Tue Feb 08 19:00:32 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 08 19:00:32 2011 -0800
tree d6ca9b5252b4e512db4256e6336a928604a234e2
parent 9bcc2a748b46c4125838c2b2289d1ccc8dde9752
parent fd22edc66818e0336597e23dafc9db4dcfb6878e

Merge "MTP: Fix NPE in MtpPropertyGroup"

media/java/android/mtp/MtpPropertyGroup.java

diff --git a/media/java/android/mtp/MtpPropertyGroup.java b/media/java/android/mtp/MtpPropertyGroup.java
index 2e80fe8..fceedd2 100644
--- a/media/java/android/mtp/MtpPropertyGroup.java
+++ b/media/java/android/mtp/MtpPropertyGroup.java
@@ -337,8 +337,8 @@
             for (int objectIndex = 0; objectIndex < count; objectIndex++) {
                 if (c != null) {
                     c.moveToNext();
+                    handle = (int)c.getLong(0);
                 }
-                handle = (int)c.getLong(0);
 
                 // iterate over all properties in the query for the given object
                 for (int propertyIndex = 0; propertyIndex < mProperties.length; propertyIndex++) {