commit 90b59dbb0d5e42e85f93e284f2ac47d4e6f7540b
author Yunlian Jiang <yunlian@google.com> Wed Mar 01 01:16:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 01 01:16:45 2017 +0000
tree 1e359b46e1f8449645a31354bacc234bf8319a85
parent 840e2dcbae8d17bb6f092df32cb12324e18090b9
parent 9a6b9ed394c3ece622029ce5c169f19fd55de5b3

Merge "fix warning: dereference of a null pointer"
am: 9a6b9ed394

Change-Id: I8f944dd30a2663262baa00a08c1e4204a29242eb

media/mtp/MtpDevice.cpp

diff --git a/media/mtp/MtpDevice.cpp b/media/mtp/MtpDevice.cpp
index e3d2ec6..52ea363 100644
--- a/media/mtp/MtpDevice.cpp
+++ b/media/mtp/MtpDevice.cpp
@@ -266,19 +266,20 @@
 }
 
 void MtpDevice::print() {
-    if (mDeviceInfo) {
-        mDeviceInfo->print();
+    if (!mDeviceInfo)
+        return;
 
-        if (mDeviceInfo->mDeviceProperties) {
-            ALOGI("***** DEVICE PROPERTIES *****\n");
-            int count = mDeviceInfo->mDeviceProperties->size();
-            for (int i = 0; i < count; i++) {
-                MtpDeviceProperty propCode = (*mDeviceInfo->mDeviceProperties)[i];
-                MtpProperty* property = getDevicePropDesc(propCode);
-                if (property) {
-                    property->print();
-                    delete property;
-                }
+    mDeviceInfo->print();
+
+    if (mDeviceInfo->mDeviceProperties) {
+        ALOGI("***** DEVICE PROPERTIES *****\n");
+        int count = mDeviceInfo->mDeviceProperties->size();
+        for (int i = 0; i < count; i++) {
+            MtpDeviceProperty propCode = (*mDeviceInfo->mDeviceProperties)[i];
+            MtpProperty* property = getDevicePropDesc(propCode);
+            if (property) {
+                property->print();
+                delete property;
             }
         }
     }