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

Commit ccf23537 authored by Tom Cherry's avatar Tom Cherry Committed by Keun-young Park
Browse files

init: replace property_get with its android::base equivalent 

Slowly try to decouple property_service.cpp from the rest of init.

Test: Boot bullhead
Change-Id: I267ae0b057bca0bf657b97cb8bfbb18199282729
parent ec16825c

init/action.cpp

+4 −5
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ 


#include <errno.h>



#include <android-base/strings.h>

#include <android-base/properties.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>



#include "builtins.h"

#include "error.h"

#include "init_parser.h"

#include "log.h"

#include "property_service.h"

#include "util.h"



using android::base::Join;
@@ -219,9 +219,8 @@ bool Action::CheckPropertyTriggers(const std::string& name, 
                found = true;

            }

        } else {

            std::string prop_val = property_get(trigger_name.c_str());

            if (prop_val.empty() || (trigger_value != "*" &&

                                     trigger_value != prop_val)) {

            std::string prop_val = android::base::GetProperty(trigger_name, "");

            if (prop_val.empty() || (trigger_value != "*" && trigger_value != prop_val)) {

                return false;

            }

        }

init/bootchart.cpp

+2 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


#include "bootchart.h"



#include "property_service.h"



#include <dirent.h>

#include <errno.h>

#include <fcntl.h>
@@ -39,6 +37,7 @@ 


#include <android-base/file.h>

#include <android-base/logging.h>

#include <android-base/properties.h>

#include <android-base/stringprintf.h>



using android::base::StringPrintf;
@@ -72,7 +71,7 @@ static void log_header() { 
  utsname uts;

  if (uname(&uts) == -1) return;



  std::string fingerprint = property_get("ro.build.fingerprint");

  std::string fingerprint = android::base::GetProperty("ro.build.fingerprint", "");

  if (fingerprint.empty()) return;



  std::string kernel_cmdline;

init/builtins.cpp

+4 −4
Original line number Diff line number Diff line
@@ -45,15 +45,16 @@ 
#include <selinux/selinux.h>

#include <selinux/label.h>



#include <fs_mgr.h>

#include <android-base/file.h>

#include <android-base/parseint.h>

#include <android-base/strings.h>

#include <android-base/properties.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <bootloader_message/bootloader_message.h>

#include <cutils/android_reboot.h>

#include <ext4_utils/ext4_crypt.h>

#include <ext4_utils/ext4_crypt_init_extensions.h>

#include <fs_mgr.h>

#include <logwrap/logwrap.h>



#include "action.h"
@@ -879,8 +880,7 @@ static int do_installkeys_ensure_dir_exists(const char* dir) { 
}



static bool is_file_crypto() {

    std::string value = property_get("ro.crypto.type");

    return value == "file";

    return android::base::GetProperty("ro.crypto.type", "") == "file";

}



static int do_installkey(const std::vector<std::string>& args) {

init/init.cpp

+9 −7
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <selinux/android.h>



#include <android-base/file.h>

#include <android-base/properties.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <android-base/unique_fd.h>
@@ -68,6 +69,7 @@ 
#include "util.h"

#include "watchdogd.h"



using android::base::GetProperty;

using android::base::StringPrintf;



struct selabel_handle *sehandle;
@@ -153,7 +155,7 @@ bool start_waiting_for_property(const char *name, const char *value) 
    if (waiting_for_prop) {

        return false;

    }

    if (property_get(name) != value) {

    if (GetProperty(name, "") != value) {

        // Current property value is not equal to expected value

        wait_prop_name = name;

        wait_prop_value = value;
@@ -441,7 +443,7 @@ static int keychord_init_action(const std::vector<std::string>& args) 


static int console_init_action(const std::vector<std::string>& args)

{

    std::string console = property_get("ro.boot.console");

    std::string console = GetProperty("ro.boot.console", "");

    if (!console.empty()) {

        default_console = "/dev/" + console;

    }
@@ -465,11 +467,11 @@ static void import_kernel_nv(const std::string& key, const std::string& value, b 
}



static void export_oem_lock_status() {

    if (property_get("ro.oem_unlock_supported") != "1") {

    if (!android::base::GetBoolProperty("ro.oem_unlock_supported", false)) {

        return;

    }



    std::string value = property_get("ro.boot.verifiedbootstate");

    std::string value = GetProperty("ro.boot.verifiedbootstate", "");



    if (!value.empty()) {

        property_set("ro.boot.flash.locked", value == "orange" ? "0" : "1");
@@ -490,7 +492,7 @@ static void export_kernel_boot_props() { 
        { "ro.boot.revision",   "ro.revision",   "0", },

    };

    for (size_t i = 0; i < arraysize(prop_map); i++) {

        std::string value = property_get(prop_map[i].src_prop);

        std::string value = GetProperty(prop_map[i].src_prop, "");

        property_set(prop_map[i].dst_prop, (!value.empty()) ? value.c_str() : prop_map[i].default_value);

    }

}
@@ -1267,7 +1269,7 @@ int main(int argc, char** argv) { 
    parser.AddSectionParser("service",std::make_unique<ServiceParser>());

    parser.AddSectionParser("on", std::make_unique<ActionParser>());

    parser.AddSectionParser("import", std::make_unique<ImportParser>());

    std::string bootscript = property_get("ro.boot.init_rc");

    std::string bootscript = GetProperty("ro.boot.init_rc", "");

    if (bootscript.empty()) {

        parser.ParseConfig("/init.rc");

        parser.set_is_system_etc_init_loaded(
@@ -1307,7 +1309,7 @@ int main(int argc, char** argv) { 
    am.QueueBuiltinAction(mix_hwrng_into_linux_rng_action, "mix_hwrng_into_linux_rng");



    // Don't mount filesystems or start core system services in charger mode.

    std::string bootmode = property_get("ro.bootmode");

    std::string bootmode = GetProperty("ro.bootmode", "");

    if (bootmode == "charger") {

        am.QueueEventTrigger("charger");

    } else {

init/keychords.cpp

+3 −2
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ 
#include <linux/keychord.h>

#include <unistd.h>



#include <android-base/properties.h>



#include "init.h"

#include "log.h"

#include "property_service.h"

#include "service.h"



static struct input_keychord *keychords = 0;
@@ -74,7 +75,7 @@ static void handle_keychord() { 
    }



    // Only handle keychords if adb is enabled.

    std::string adb_enabled = property_get("init.svc.adbd");

    std::string adb_enabled = android::base::GetProperty("init.svc.adbd", "");

    if (adb_enabled == "running") {

        Service* svc = ServiceManager::GetInstance().FindServiceByKeychord(id);

        if (svc) {