Skip to content

Additional /dev/log -> /dev/alog changes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thp wants to merge 2 commits into
base: hybris-10.1
Choose a base branch
from
Open

Additional /dev/log -> /dev/alog changes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24a46b2
Additional /dev/log -> /dev/alog changes
thp Feb 14, 2014
d3e9406
Disable printing "A N D R O I D" on the console
thp Feb 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion adb/log_service.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "sysdeps.h"
#include "adb.h"

#define LOG_FILE_DIR "/dev/log/"
#define LOG_FILE_DIR "/dev/alog/"

void write_log_entry(int fd, struct logger_entry *buf);

Expand Down
4 changes: 2 additions & 2 deletions debuggerd/tombstone.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,8 +590,8 @@ static void dump_log_file(log_t* log, pid_t pid, const char* filename,
*/
static void dump_logs(log_t* log, pid_t pid, bool tailOnly)
{
dump_log_file(log, pid, "/dev/log/system", tailOnly);
dump_log_file(log, pid, "/dev/log/main", tailOnly);
dump_log_file(log, pid, "/dev/alog/system", tailOnly);
dump_log_file(log, pid, "/dev/alog/main", tailOnly);
}

/*
Expand Down
4 changes: 4 additions & 0 deletions init/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,8 @@ static int console_init_action(int nargs, char **args)
have_console = 1;
close(fd);

// mer-hybris: Don't pollute the console
#if 0
if( load_565rle_image(INIT_IMAGE_FILE) ) {
fd = open("/dev/tty0", O_WRONLY);
if (fd >= 0) {
Expand All @@ -621,6 +623,8 @@ static int console_init_action(int nargs, char **args)
close(fd);
}
}
#endif

return 0;
}

Expand Down
7 changes: 4 additions & 3 deletions liblog/fake_log_device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,13 @@ static void deleteFakeFd(int fd)
*/
static void configureInitialState(const char* pathName, LogState* logState)
{
static const int kDevLogLen = sizeof("/dev/log/") - 1;

logState->debugName = strdup(pathName);

/* identify binary logs */
if (strcmp(pathName + kDevLogLen, "events") == 0) {
// XXX hybris: Just in case we end up here with some app
// passing in /dev/log/ instead of /dev/alog/, compare both
if (strcmp(pathName, "/dev/log/events") == 0 ||
strcmp(pathName, "/dev/alog/events") == 0) {
logState->isBinary = 1;
}

Expand Down
2 changes: 1 addition & 1 deletion rootdir/ueventd.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

# Anyone can read the logs, but if they're not in the "logs"
# group, then they'll only see log entries for their UID.
/dev/log/* 0666 root log
/dev/alog/* 0666 root log

# the msm hw3d client device node is world writable/readable.
/dev/msm_hw3dc 0666 root root
Expand Down