From fd22edc66818e0336597e23dafc9db4dcfb6878e Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Tue, 8 Feb 2011 21:45:22 -0500
Subject: [PATCH] MTP: Fix NPE in MtpPropertyGroup

Change-Id: I65fbd3f2f62724434136c6ae310e6647884902d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 media/java/android/mtp/MtpPropertyGroup.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/java/android/mtp/MtpPropertyGroup.java b/media/java/android/mtp/MtpPropertyGroup.java
index 2e80fe866847f..fceedd28e0406 100644
--- a/media/java/android/mtp/MtpPropertyGroup.java
+++ b/media/java/android/mtp/MtpPropertyGroup.java
@@ -337,8 +337,8 @@ class MtpPropertyGroup {
             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++) {