Merge change 26004 into eclair (9fa16457) · Commits · e / os / android_frameworks_native-old

libs/utils/ResourceTypes.cpp

+10 −2

Original line number	Diff line number	Diff line
		@@ -1740,7 +1740,11 @@ bool ResTable::getResourceName(uint32_t resID, resource_name* outName) const
		const int e = Res_GETENTRY(resID);

		if (p < 0) {
		if (Res_GETPACKAGE(resID)+1 == 0) {
		LOGW("No package identifier when getting name for resource number 0x%08x", resID);
		} else {
		LOGW("Resources don't contain pacakge for resource number 0x%08x", resID);
		}
		return false;
		}
		if (t < 0) {
		@@ -1786,7 +1790,11 @@ ssize_t ResTable::getResource(uint32_t resID, Res_value* outValue, bool mayBeBag
		const int e = Res_GETENTRY(resID);

		if (p < 0) {
		LOGW("No package identifier when getting value for resource number 0x%08x", resID);
		if (Res_GETPACKAGE(resID)+1 == 0) {
		LOGW("No package identifier when getting name for resource number 0x%08x", resID);
		} else {
		LOGW("Resources don't contain pacakge for resource number 0x%08x", resID);
		}
		return BAD_INDEX;
		}
		if (t < 0) {