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

Commit 82fd15cb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add ANDROID_LOG to supress android specific logs"

parents cf60b4c4 2fe2347e

libs/androidfw/AssetManager2.cpp

+8 −1
Original line number Original line Diff line number Diff line
@@ -35,6 +35,12 @@ 
#endif

#endif

#endif

#endif





#ifdef __ANDROID__

#define ANDROID_LOG(x) LOG(x)

#else

#define ANDROID_LOG(x) std::stringstream()

#endif



#include "androidfw/ResourceUtils.h"

#include "androidfw/ResourceUtils.h"





namespace android {

namespace android {
@@ -380,7 +386,8 @@ ApkAssetsCookie AssetManager2::FindEntry(uint32_t resid, uint16_t density_overri 




  const uint8_t package_idx = package_ids_[package_id];

  const uint8_t package_idx = package_ids_[package_id];

  if (package_idx == 0xff) {

  if (package_idx == 0xff) {

    LOG(ERROR) << base::StringPrintf("No package ID %02x found for ID 0x%08x.", package_id, resid);

    ANDROID_LOG(ERROR) << base::StringPrintf("No package ID %02x found for ID 0x%08x.",

                                             package_id, resid);

    return kInvalidCookie;

    return kInvalidCookie;

  }

  }