commit b406b0e56546ce16f4768c82a5cdad19535122c8
author Mark Hansen <markhansen@google.com> Fri Oct 14 02:18:37 2022 +0000
committer Mark Hansen <markhansen@google.com> Fri Oct 14 02:21:06 2022 +0000
tree 2d51a7d302f96b09d414233dfc936d6783a71c56
parent 8314a3e51bd31e9c11a9b61e4bef88b2ad65803d

Give slightly more descriptive error messages when you can't find resource IDs

This makes the error message slightly more googleable, and gives a hint as to what kind of ID could be wrong.

This was motivated by me struggling to find the source of this error in my logs.

Change-Id: Ide248edc08d24c5577dd2198233b738641e124ec

libs/androidfw/AssetManager2.cpp

diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp
index 136fc6c..400829e 100644
--- a/libs/androidfw/AssetManager2.cpp
+++ b/libs/androidfw/AssetManager2.cpp
@@ -580,7 +580,7 @@
 
   // 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 @@
   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);
   }