diff options
| author | 2022-11-24 01:07:36 +0000 | |
|---|---|---|
| committer | 2022-11-24 01:07:36 +0000 | |
| commit | f33709743b9eacea5825af7eaacfdbc2cc6271ec (patch) | |
| tree | 83432b0c1ff07369f90f6f89f58aba70df7eb780 /libs/androidfw/AssetManager2.cpp | |
| parent | 9eff0bd1997b281cfae0bb40b95843549c0db7df (diff) | |
| parent | 64bc571676ccd914e47f18ebfa8aa87a1efe75ad (diff) | |
Merge "Give slightly more descriptive error messages when you can't find resource IDs" am: ae00bbfdd9 am: be2d8803a2 am: 64bc571676
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2254479
Change-Id: I92df80d602aca7e3c3b8bf3f89b16f47ea35ab10
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 06ffb72d183b..3fa369d7ff4a 100644 --- a/libs/androidfw/AssetManager2.cpp +++ b/libs/androidfw/AssetManager2.cpp @@ -571,7 +571,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); } @@ -580,7 +580,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); } |