Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a161f06 authored by Yunlian Jiang's avatar Yunlian Jiang Committed by android-build-merger
Browse files

Merge "fix warning: dereference of a null pointer" am: 9a6b9ed3 am: 90b59dbb 

am: daaea6d2

Change-Id: If2eb8cba1df0760fb2c01e65e28d9b3f8ec4912c
parents c9dce5e8 daaea6d2

media/mtp/MtpDevice.cpp

+13 −12
Original line number Diff line number Diff line
@@ -277,7 +277,9 @@ void MtpDevice::close() { 
}



void MtpDevice::print() {

    if (mDeviceInfo) {

    if (!mDeviceInfo)

        return;



    mDeviceInfo->print();



    if (mDeviceInfo->mDeviceProperties) {
@@ -292,7 +294,6 @@ void MtpDevice::print() { 
            }

        }

    }

    }



    if (mDeviceInfo->mPlaybackFormats) {

            ALOGI("***** OBJECT PROPERTIES *****\n");