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

Commit 719667ba authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "__android_log_is_debuggable() shouldn't be an apex symbol" am: 69fc7b62 am: 96363323 

am: 1c8edfa5

Change-Id: I065deb020c18b8ce8325d4a6b425bf497fdc046a
parents 7fff457b 1c8edfa5

fs_mgr/fs_mgr.cpp

+2 −6
Original line number Diff line number Diff line
@@ -1098,9 +1098,7 @@ int fs_mgr_mount_all(Fstab* fstab, int mount_mode) { 
            }

        } else if ((current_entry.fs_mgr_flags.verify)) {

            int rc = fs_mgr_setup_verity(&current_entry, true);

            if (__android_log_is_debuggable() &&

                    (rc == FS_MGR_SETUP_VERITY_DISABLED ||

                     rc == FS_MGR_SETUP_VERITY_SKIPPED)) {

            if (rc == FS_MGR_SETUP_VERITY_DISABLED || rc == FS_MGR_SETUP_VERITY_SKIPPED) {

                LINFO << "Verity disabled";

            } else if (rc != FS_MGR_SETUP_VERITY_SUCCESS) {

                LERROR << "Could not set up verified partition, skipping!";
@@ -1331,9 +1329,7 @@ static int fs_mgr_do_mount_helper(Fstab* fstab, const std::string& n_name, 
            }

        } else if (fstab_entry.fs_mgr_flags.verify) {

            int rc = fs_mgr_setup_verity(&fstab_entry, true);

            if (__android_log_is_debuggable() &&

                    (rc == FS_MGR_SETUP_VERITY_DISABLED ||

                     rc == FS_MGR_SETUP_VERITY_SKIPPED)) {

            if (rc == FS_MGR_SETUP_VERITY_DISABLED || rc == FS_MGR_SETUP_VERITY_SKIPPED) {

                LINFO << "Verity disabled";

            } else if (rc != FS_MGR_SETUP_VERITY_SUCCESS) {

                LERROR << "Could not set up verified partition, skipping!";

libcutils/trace-dev.inc

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static bool atrace_is_cmdline_match(const char* cmdline) 
// Determine whether application-level tracing is enabled for this process.

static bool atrace_is_app_tracing_enabled()

{

    bool sys_debuggable = __android_log_is_debuggable();

    bool sys_debuggable = property_get_bool("ro.debuggable", 0);

    bool result = false;



    if (sys_debuggable || atrace_is_debuggable) {

liblog/liblog.map.txt

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ LIBLOG_M { 
LIBLOG_O {

  global:

    __android_log_is_loggable_len;

    __android_log_is_debuggable; # apex vndk

    __android_log_is_debuggable; # vndk

};



LIBLOG_Q {