diff options
| author | 2022-11-24 00:02:52 +0000 | |
|---|---|---|
| committer | 2022-11-24 00:02:52 +0000 | |
| commit | be2d8803a2d27c3829fc60eb9422cbb75555278e (patch) | |
| tree | 91a1bc2a8f10811b30d54367cb6a1bafb393ec6f /libs/androidfw/AssetManager2.cpp | |
| parent | d5b532c6522e6ae244a586a2b66295e3d0ed8bff (diff) | |
| parent | ae00bbfdd91931e52a7d0f0c590990b033e54dbd (diff) | |
Merge "Give slightly more descriptive error messages when you can't find resource IDs" am: ae00bbfdd9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2254479
Change-Id: I8e9a15d08186b20bd4e112f264f092062838ea39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
| -rw-r--r-- | libs/androidfw/AssetManager2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp index 136fc6ca4e2a..400829e15364 100644 --- a/libs/androidfw/AssetManager2.cpp +++ b/libs/androidfw/AssetManager2.cpp @@ -580,7 +580,7 @@ base::expected<FindEntryResult, NullOrIOError> AssetManager2::FindEntry( // Retrieve the package group from the package id of the resource id. if (UNLIKELY(!is_valid_resid(resid))) { - LOG(ERROR) << base::StringPrintf("Invalid ID 0x%08x.", resid); + LOG(ERROR) << base::StringPrintf("Invalid resource ID 0x%08x.", resid); return base::unexpected(std::nullopt); } @@ -589,7 +589,7 @@ base::expected<FindEntryResult, NullOrIOError> AssetManager2::FindEntry( const uint16_t entry_idx = get_entry_id(resid); uint8_t package_idx = package_ids_[package_id]; if (UNLIKELY(package_idx == 0xff)) { - ANDROID_LOG(ERROR) << base::StringPrintf("No package ID %02x found for ID 0x%08x.", + ANDROID_LOG(ERROR) << base::StringPrintf("No package ID %02x found for resource ID 0x%08x.", package_id, resid); return base::unexpected(std::nullopt); } |