diff options
| author | Yi Kong <yikong@google.com> | 2019-08-30 08:08:14 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-30 08:08:14 -0700 |
| commit | f9b9903da943dbc1dc3424ff141d36a22ca6625f (patch) | |
| tree | 343c99e9ff4018d0bec916f9971d16c267be1daf /libs/androidfw | |
| parent | a6466285e9a021387d89049371ec5edce89891cc (diff) | |
| parent | 55be4efaae2da1120a15b80f53a7276ed4a71836 (diff) | |
Merge "Fix reversed logic" am: 946e857c71 am: ae6248d35b am: 6f1a7d3c10 am: 4559d83655
am: 55be4efaae
Change-Id: Ia459eab9db6ecb6558f868495189655146025f9b
Diffstat (limited to 'libs/androidfw')
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 8a035dbbc0f5..535386920265 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -7402,12 +7402,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", |