Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3370974 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Give slightly more descriptive error messages when you can't find... 

Merge "Give slightly more descriptive error messages when you can't find resource IDs" am: ae00bbfd am: be2d8803 am: 64bc5716

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2254479



Change-Id: I92df80d602aca7e3c3b8bf3f89b16f47ea35ab10
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9eff0bd1 64bc5716

libs/androidfw/AssetManager2.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

  }