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

Commit 526aa056 authored by Yi Jin's avatar Yi Jin
Browse files

Modify system properties proto 

Test: atest incident_helper_test
Change-Id: Id81922e7f4412090e3b72b3a0fc1151995635885
parent 107f7cc4

cmds/incident_helper/src/parsers/SystemPropertiesParser.cpp

+16 −3
Original line number Diff line number Diff line
@@ -149,12 +149,25 @@ SystemPropertiesParser::Parse(const int in, const int out) const 
                   SystemPropertiesProto::Ro::Product::_FIELD_COUNT);

    Message product(&productTable);



    Table vendorTable(SystemPropertiesProto::Ro::Product::Vendor::_FIELD_NAMES,

    Table pVendorTable(SystemPropertiesProto::Ro::Product::Vendor::_FIELD_NAMES,

            SystemPropertiesProto::Ro::Product::Vendor::_FIELD_IDS,

            SystemPropertiesProto::Ro::Product::Vendor::_FIELD_COUNT);

    Message vendor(&vendorTable);

    product.addSubMessage(SystemPropertiesProto::Ro::Product::VENDOR, &vendor);

    Message pVendor(&pVendorTable);

    product.addSubMessage(SystemPropertiesProto::Ro::Product::VENDOR, &pVendor);

    ro.addSubMessage(SystemPropertiesProto::Ro::PRODUCT, &product);



    Table telephonyTable(SystemPropertiesProto::Ro::Telephony::_FIELD_NAMES,

                   SystemPropertiesProto::Ro::Telephony::_FIELD_IDS,

                   SystemPropertiesProto::Ro::Telephony::_FIELD_COUNT);

    Message telephony(&telephonyTable);

    ro.addSubMessage(SystemPropertiesProto::Ro::TELEPHONY, &telephony);



    Table vendorTable(SystemPropertiesProto::Ro::Vendor::_FIELD_NAMES,

                   SystemPropertiesProto::Ro::Vendor::_FIELD_IDS,

                   SystemPropertiesProto::Ro::Vendor::_FIELD_COUNT);

    Message vendor(&vendorTable);

    ro.addSubMessage(SystemPropertiesProto::Ro::VENDOR, &vendor);



    sysProp.addSubMessage(SystemPropertiesProto::RO, &ro);



    Table sysTable(SystemPropertiesProto::Sys::_FIELD_NAMES,

core/proto/android/os/system_properties.proto

+24 −14
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ message SystemPropertiesProto { 
        optional string crypto_state = 21;

        optional string crypto_type = 22;

        optional string dalvik_vm_native_bridge = 23;

        optional int32  debuggable = 24;

        optional bool  debuggable = 24;

        optional string frp_pst = 25;

        optional string gfx_driver_0 = 26;
@@ -413,19 +413,29 @@ message SystemPropertiesProto { 
        optional string revision = 35;

        optional int32  sf_lcd_density = 36;

        optional bool   storage_manager_enabled = 37;

        optional bool   telephony_call_ring_multiple = 38;

        optional int32  telephony_default_cdma_sub = 39;

        optional int32  telephony_default_network = 40;

        optional string url_legal = 41;

        optional string url_legal_android_privacy = 42;

        optional string vendor_build_date = 43;

        optional int32  vendor_build_date_utc = 44;

        optional string vendor_build_fingerprint = 45;

        optional string vndk_version = 46;

        optional int32  vts_coverage = 47;

        optional string zygote = 48;



        // Next Tag: 49



        message Telephony {

            optional bool  call_ring_multiple = 1;

            optional int32 default_cdma_sub = 2;

            optional int32 default_network = 3;

        }

        optional Telephony telephony = 38;



        optional string url_legal = 39;

        optional string url_legal_android_privacy = 40;



        message Vendor {

            optional string build_date = 1;

            optional int32  build_date_utc = 2;

            optional string build_fingerprint = 3;

        }

        optional Vendor vendor = 41;



        optional string vndk_version = 42;

        optional int32  vts_coverage = 43;

        optional string zygote = 44;



        // Next Tag: 45

    }

    optional Ro ro = 21;