diff options
| author | 2025-03-12 10:56:11 -0700 | |
|---|---|---|
| committer | 2025-03-12 10:56:11 -0700 | |
| commit | 3f7eacaaf860a21ea15b6203abcdc0e60f9bd269 (patch) | |
| tree | cb7484c525c7a9b1e8da4e6be71ef687415702e1 /libs/androidfw | |
| parent | 4442e64290e2e0dbcf06a9e182cebb8e791f6960 (diff) | |
| parent | 67fc58337340df3f35794e0eff5884d353646197 (diff) | |
Merge "Fix incorrect NULL check in IncFsFileMap reference assertions" into main am: 2576ad7087 am: 67fc583373
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3526790
Change-Id: I265c6c114f74e1b9b6e40edc30b7f5cfb8b3bc27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw')
| -rw-r--r-- | libs/androidfw/Asset.cpp | 4 |
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 |