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

Commit 920b3c22 authored by Brandon Liu's avatar Brandon Liu Committed by Android (Google) Code Review
Browse files

Merge "Make ProtoSerialize using uint32_t for TYPE_INT_DEC"

parents e208faf0 7fbd6b41

tools/aapt2/format/proto/ProtoDeserialize.cpp

+1 −1
Original line number Diff line number Diff line
@@ -916,7 +916,7 @@ std::unique_ptr<Item> DeserializeItemFromPb(const pb::Item& pb_item, 
        } break;

        case pb::Primitive::kIntDecimalValue: {

          val.dataType = android::Res_value::TYPE_INT_DEC;

          val.data = static_cast<uint32_t>(pb_prim.int_decimal_value());

          val.data = static_cast<int32_t>(pb_prim.int_decimal_value());

        } break;

        case pb::Primitive::kIntHexadecimalValue: {

          val.dataType = android::Res_value::TYPE_INT_HEX;