From 5da864845e024833c4c7f641acd7c88187a6bc1e Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Tue, 7 Dec 2010 13:51:54 -0800
Subject: MTP: Read property code before calling isDeviceProperty in
 MtpProperty::read()

Change-Id: I0b1493f3af5d9caac08327f9ffba91ee255d3d55
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 media/mtp/MtpProperty.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'media/mtp/MtpProperty.cpp')

diff --git a/media/mtp/MtpProperty.cpp b/media/mtp/MtpProperty.cpp
index 3b38720..b095ce1 100644
--- a/media/mtp/MtpProperty.cpp
+++ b/media/mtp/MtpProperty.cpp
@@ -122,9 +122,8 @@ MtpProperty::~MtpProperty() {
 }
 
 void MtpProperty::read(MtpDataPacket& packet) {
-    bool deviceProp = isDeviceProperty();
-
     mCode = packet.getUInt16();
+    bool deviceProp = isDeviceProperty();
     mType = packet.getUInt16();
     mWriteable = (packet.getUInt8() == 1);
     switch (mType) {
-- 
cgit v1.1