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

Commit dcb56446 authored by Ryan Prichard's avatar Ryan Prichard
Browse files

mtp: add <assert.h> and <functional> includes 

Fix storageID -> mStorageID typo: This assertion is never compiled,
because NDEBUG is defined. However, this code also doesn't include
assert.h, and upgrading libc++ incidentally removed a transitive
assert.h include. With the assert macro missing, the compiler finally
compiled the info->storageID expression and diagnosed its typo.

Bug: 175635923
Test: m MODULES-IN-frameworks-av-media-mtp
Change-Id: I9e331f28722e8eba314f7f9a731c57f6ee8cb99e
parent dcd31c41

media/mtp/tests/MtpFuzzer/MtpMockDatabase.cpp

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */



#include <assert.h>

#include <stdlib.h>

#include <string.h>

#include <sys/stat.h>
@@ -40,7 +41,7 @@ MtpMockDatabase::~MtpMockDatabase() { 
}



void MtpMockDatabase::addObject(MtpObjectInfo* info) {

    assert(hasStorage(info->storageID));

    assert(hasStorage(info->mStorageID));



    // we take ownership

    mObjects.push_back(info);

media/mtp/tests/MtpFuzzer/mtp_data_packet_fuzzer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <MtpDataPacket.h>

#include <MtpDevHandle.h>

#include <MtpPacketFuzzerUtils.h>

#include <functional>

#include <fuzzer/FuzzedDataProvider.h>

#include <utils/String16.h>

media/mtp/tests/MtpFuzzer/mtp_device_fuzzer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <MtpStringBuffer.h>

#include <android-base/unique_fd.h>

#include <fcntl.h>

#include <functional>

#include <fuzzer/FuzzedDataProvider.h>

#include <linux/usb/ch9.h>

#include <sys/mman.h>

media/mtp/tests/MtpFuzzer/mtp_event_packet_fuzzer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <MtpDevHandle.h>

#include <MtpEventPacket.h>

#include <MtpPacketFuzzerUtils.h>

#include <functional>

#include <fuzzer/FuzzedDataProvider.h>



using namespace android;

media/mtp/tests/MtpFuzzer/mtp_packet_fuzzer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <MtpDevHandle.h>

#include <MtpPacket.h>

#include <MtpPacketFuzzerUtils.h>

#include <functional>

#include <fuzzer/FuzzedDataProvider.h>

#include <mtp.h>