ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "__android_log_is_debuggable() shouldn't be an apex symbol"

Browse source
This commit is contained in:
Elliott Hughes 2019-02-21 06:33:47 +00:00 • committed by Gerrit Code Review
commit 69fc7b628d
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs_mgr/fs_mgr.cpp
View file

@ -1098,9 +1098,7 @@ int fs_mgr_mount_all(Fstab* fstab, int mount_mode) {
} }
} else if ((current_entry.fs_mgr_flags.verify)) { } else if ((current_entry.fs_mgr_flags.verify)) {
int rc = fs_mgr_setup_verity(&current_entry, true); int rc = fs_mgr_setup_verity(&current_entry, true);
if (__android_log_is_debuggable() && if (rc == FS_MGR_SETUP_VERITY_DISABLED || rc == FS_MGR_SETUP_VERITY_SKIPPED) {
(rc == FS_MGR_SETUP_VERITY_DISABLED ||
rc == FS_MGR_SETUP_VERITY_SKIPPED)) {
LINFO << "Verity disabled"; LINFO << "Verity disabled";
} else if (rc != FS_MGR_SETUP_VERITY_SUCCESS) { } else if (rc != FS_MGR_SETUP_VERITY_SUCCESS) {
LERROR << "Could not set up verified partition, skipping!"; 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) { } else if (fstab_entry.fs_mgr_flags.verify) {
int rc = fs_mgr_setup_verity(&fstab_entry, true); int rc = fs_mgr_setup_verity(&fstab_entry, true);
if (__android_log_is_debuggable() && if (rc == FS_MGR_SETUP_VERITY_DISABLED || rc == FS_MGR_SETUP_VERITY_SKIPPED) {
(rc == FS_MGR_SETUP_VERITY_DISABLED ||
rc == FS_MGR_SETUP_VERITY_SKIPPED)) {
LINFO << "Verity disabled"; LINFO << "Verity disabled";
} else if (rc != FS_MGR_SETUP_VERITY_SUCCESS) { } else if (rc != FS_MGR_SETUP_VERITY_SUCCESS) {
LERROR << "Could not set up verified partition, skipping!"; LERROR << "Could not set up verified partition, skipping!";

2
libcutils/trace-dev.inc
View file

@ -80,7 +80,7 @@ static bool atrace_is_cmdline_match(const char* cmdline)
// Determine whether application-level tracing is enabled for this process. // Determine whether application-level tracing is enabled for this process.
static bool atrace_is_app_tracing_enabled() 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; bool result = false;
if (sys_debuggable || atrace_is_debuggable) { if (sys_debuggable || atrace_is_debuggable) {

2
liblog/liblog.map.txt
View file

@ -51,7 +51,7 @@ LIBLOG_M {
LIBLOG_O { LIBLOG_O {
global: global:
__android_log_is_loggable_len; __android_log_is_loggable_len;
__android_log_is_debuggable; # apex vndk __android_log_is_debuggable; # vndk
}; };
LIBLOG_Q { LIBLOG_Q {