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

Commit f9b9903d authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

Merge "Fix reversed logic" am: 946e857c am: ae6248d3 am: 6f1a7d3c am: 4559d836 

am: 55be4efa

Change-Id: Ia459eab9db6ecb6558f868495189655146025f9b
parents a6466285 55be4efa

libs/androidfw/ResourceTypes.cpp

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