summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-11-23 23:31:58 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2022-11-23 23:31:58 +0000
commitae00bbfdd91931e52a7d0f0c590990b033e54dbd (patch)
treea1e1624030a4d8035f3793e58aebe236ef9fe67d
parent02cec105d37bc00972572568dda1413eba51057b (diff)
parentb406b0e56546ce16f4768c82a5cdad19535122c8 (diff)
Merge "Give slightly more descriptive error messages when you can't find resource IDs"
-rw-r--r--libs/androidfw/AssetManager2.cpp4
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);
}