Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f69c334d authored by Yi Kong's avatar Yi Kong
Browse files

Fix reversed logic 

To check if a value falls in a range, it should be
  a >= MIN && a <= MAX
instead of
  a >= MIN || a <= MAX

Found by an experimental Clang warning change,
https://reviews.llvm.org/D66044.

Test: presubmit
Change-Id: I91e2a04687285d9311fd831197c73af38ec8379c
parent c53985fc

libs/androidfw/ResourceTypes.cpp

+2 −2
Original line number Diff line number Diff line
@@ -7344,12 +7344,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",