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

Commit daaea6d2 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

Change-Id: I032627fd4dfa35421e2dd7c81c008b9e87c8470c
parents 01520fce 90b59dbb

media/mtp/MtpDevice.cpp

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



void MtpDevice::print() {

    if (mDeviceInfo) {

    if (!mDeviceInfo)

        return;



    mDeviceInfo->print();



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

        }

    }

    }



    if (mDeviceInfo->mPlaybackFormats) {

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