Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add ANDROID_LOG to supress android specific logs"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-28 10:13:36 +00:00
committed by Android (Google) Code Review
parent cf60b4c4f4 2fe2347e1e
commit 82fd15cbaa
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/androidfw/AssetManager2.cpp
View File

@@ -35,6 +35,12 @@
#endif
#endif
#ifdef __ANDROID__
#define ANDROID_LOG(x) LOG(x)
#else
#define ANDROID_LOG(x) std::stringstream()
#endif
#include "androidfw/ResourceUtils.h"
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];
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;
}