commit faac5c1a0aac9b09c4edf3d3ca3ea266787fd0c5
author Mike Lockwood <lockwood@android.com> Tue Dec 07 17:21:01 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 07 17:21:01 2010 -0800
tree 139a904456d22c49b5231a6f545f5b66912fb21c
parent 14609818a401ee874482042131f7a3cbd77395b2
parent 5da864845e024833c4c7f641acd7c88187a6bc1e

Merge "MTP: Read property code before calling isDeviceProperty in MtpProperty::read()"

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 @@
 }
 
 void MtpProperty::read(MtpDataPacket& packet) {
-    bool deviceProp = isDeviceProperty();
-
     mCode = packet.getUInt16();
+    bool deviceProp = isDeviceProperty();
     mType = packet.getUInt16();
     mWriteable = (packet.getUInt8() == 1);
     switch (mType) {