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

Merge "Fix reversed logic" am: 946e857c71 am: ae6248d35b am: 6f1a7d3c10

Browse Source 
am: 4559d83655

Change-Id: I6e10b29bfddc5d3f7d4b04d81ab7b610261bebc1
This commit is contained in:
Yi Kong
2019-08-30 07:45:34 -07:00
committed by android-build-merger
parent ac2039a942 4559d83655
commit 55be4efaae
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/androidfw/ResourceTypes.cpp
View File

@@ -7403,12 +7403,12 @@ void ResTable::print_value(const Package* pkg, const Res_value& value) const
print_complex(value.data, true); print_complex(value.data, true);
printf("\n"); printf("\n");
} else if (value.dataType >= Res_value::TYPE_FIRST_COLOR_INT } else if (value.dataType >= Res_value::TYPE_FIRST_COLOR_INT
|| value.dataType <= Res_value::TYPE_LAST_COLOR_INT) { && value.dataType <= Res_value::TYPE_LAST_COLOR_INT) {
printf("(color) #%08x\n", value.data); printf("(color) #%08x\n", value.data);
} else if (value.dataType == Res_value::TYPE_INT_BOOLEAN) { } else if (value.dataType == Res_value::TYPE_INT_BOOLEAN) {
printf("(boolean) %s\n", value.data ? "true" : "false"); printf("(boolean) %s\n", value.data ? "true" : "false");
} else if (value.dataType >= Res_value::TYPE_FIRST_INT } else if (value.dataType >= Res_value::TYPE_FIRST_INT
|| value.dataType <= Res_value::TYPE_LAST_INT) { && value.dataType <= Res_value::TYPE_LAST_INT) {
printf("(int) 0x%08x or %d\n", value.data, value.data); printf("(int) 0x%08x or %d\n", value.data, value.data);
} else { } else {
printf("(unknown type) t=0x%02x d=0x%08x (s=0x%04x r=0x%02x)\n", printf("(unknown type) t=0x%02x d=0x%08x (s=0x%04x r=0x%02x)\n",