summaryrefslogtreecommitdiff
path: root/libs/androidfw
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-12 09:14:32 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-03-12 09:14:32 -0700
commit2576ad70870bd2b6c710072fd73dcd68e4637d19 (patch)
tree3c1df4c56aba8756a8476b7c6c71c749fd16beda /libs/androidfw
parentd5c28dd736aa52628af411cc56676ca4cb7fd0e2 (diff)
parent7ac48df14493665922c3746fecccad3794e6ae34 (diff)
Merge "Fix incorrect NULL check in IncFsFileMap reference assertions" into main
Diffstat (limited to 'libs/androidfw')
-rw-r--r--libs/androidfw/Asset.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/Asset.cpp b/libs/androidfw/Asset.cpp
index 5a4cff0c319e..4e820b6857a1 100644
--- a/libs/androidfw/Asset.cpp
+++ b/libs/androidfw/Asset.cpp
@@ -453,7 +453,7 @@ status_t _FileAsset::openChunk(incfs::IncFsFileMap&& dataMap, base::unique_fd fd
{
assert(mFp == NULL); // no reopen
assert(!mMap.has_value());
- assert(dataMap != NULL);
+ assert(dataMap.data());
mMap = std::move(dataMap);
mStart = -1; // not used
@@ -798,7 +798,7 @@ status_t _CompressedAsset::openChunk(incfs::IncFsFileMap&& dataMap, size_t uncom
{
assert(mFd < 0); // no re-open
assert(!mMap.has_value());
- assert(dataMap != NULL);
+ assert(dataMap.data());
mMap = std::move(dataMap);
mStart = -1; // not used