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

Commit ebf46586 authored by Dima Zavin's avatar Dima Zavin
Browse files

init: do not load default.prop from ramdisk in charger mode 



Change-Id: Ic471b891829d7f857674b925c9948954972d9ecb
Signed-off-by: default avatarDima Zavin <dima@android.com>
parent 7e14e0c9

init/init.c

+5 −1
Original line number Diff line number Diff line
@@ -548,8 +548,12 @@ static int wait_for_coldboot_done_action(int nargs, char **args) 


static int property_init_action(int nargs, char **args)

{

    bool load_defaults = true;



    INFO("property init\n");

    property_init();

    if (!strcmp(bootmode, "charger"))

        load_defaults = false;

    property_init(load_defaults);

    return 0;

}

init/property_service.c

+3 −2
Original line number Diff line number Diff line
@@ -505,9 +505,10 @@ static void load_persistent_properties() 
    persistent_properties_loaded = 1;

}



void property_init(void)

void property_init(bool load_defaults)

{

    init_property_area();

    if (load_defaults)

        load_properties_from_file(PROP_PATH_RAMDISK_DEFAULT);

}

init/property_service.h

+3 −1
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
#ifndef _INIT_PROPERTY_H

#define _INIT_PROPERTY_H



#include <stdbool.h>



extern void handle_property_set_fd(void);

extern void property_init(void);

extern void property_init(bool load_defaults);

extern void load_persist_props(void);

extern void start_property_service(void);

void get_property_workspace(int *fd, int *sz);