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

Commit d34c722c authored by Andres Morales's avatar Andres Morales Committed by Android (Google) Code Review
Browse files

Merge changes Iac33dbaa,I18fcd37d into mnc-dev 

* changes:
  pass in correct buffer to print_id
  stop including rootdir build.prop
parents 507bfdfc e892a3f3

init/property_service.cpp

+0 −1
Original line number Diff line number Diff line
@@ -509,7 +509,6 @@ void load_persist_props(void) { 
void load_all_props() {

    load_properties_from_file(PROP_PATH_SYSTEM_BUILD, NULL);

    load_properties_from_file(PROP_PATH_VENDOR_BUILD, NULL);

    load_properties_from_file(PROP_PATH_BOOTIMAGE_BUILD, NULL);

    load_properties_from_file(PROP_PATH_FACTORY, "ro.*");



    load_override_properties();

mkbootimg/mkbootimg.c

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ int main(int argc, char **argv) 
    }



    if (get_id) {

        print_id(sha, sizeof(hdr.id));

        print_id((uint8_t *) hdr.id, sizeof(hdr.id));

    }



    return 0;