Merge "Fix reversed logic" am: 946e857c71

am: ae6248d35b

Change-Id: Ib0b74cf49e7a14e96d1996a55ec4e13667d94567
This commit is contained in:
Yi Kong
2019-08-30 07:26:06 -07:00
committed by android-build-merger

View File

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