commit fd22edc66818e0336597e23dafc9db4dcfb6878e
author Mike Lockwood <lockwood@android.com> Tue Feb 08 21:45:22 2011 -0500
committer Mike Lockwood <lockwood@android.com> Tue Feb 08 21:45:22 2011 -0500
tree 160a954be92e2b8deee159bb50de24ea486f74b3
parent 5ed9a80571ede30d4cb7967227bff996c9cecb9e

MTP: Fix NPE in MtpPropertyGroup

Change-Id: I65fbd3f2f62724434136c6ae310e6647884902d2
Signed-off-by: Mike Lockwood <lockwood@android.com>

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++) {