Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove ANDROID_LOG_RDONLY"

Browse Source
This commit is contained in:
Tom Cherry
2020-03-24 21:00:57 +00:00
committed by Gerrit Code Review
parent a6d47fba4a 013bd1623f
commit f87fe63af1
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/incidentd/src/Section.cpp
View File

@@ -512,8 +512,8 @@ status_t LogSection::BlockingCall(int pipeWriteFd) const {
// Open log buffer and getting logs since last retrieved time if any. // Open log buffer and getting logs since last retrieved time if any.
unique_ptr<logger_list, void (*)(logger_list*)> loggers( unique_ptr<logger_list, void (*)(logger_list*)> loggers(
gLastLogsRetrieved.find(mLogID) == gLastLogsRetrieved.end() gLastLogsRetrieved.find(mLogID) == gLastLogsRetrieved.end()
? android_logger_list_alloc(ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK, 0, 0) ? android_logger_list_alloc(ANDROID_LOG_NONBLOCK, 0, 0)
: android_logger_list_alloc_time(ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK, : android_logger_list_alloc_time(ANDROID_LOG_NONBLOCK,
gLastLogsRetrieved[mLogID], 0), gLastLogsRetrieved[mLogID], 0),
android_logger_list_free); android_logger_list_free);

9
core/jni/android_app_admin_SecurityLog.cpp
View File

@@ -41,7 +41,7 @@ static void android_app_admin_SecurityLog_readEvents(JNIEnv* env, jobject /* cla
jniThrowNullPointerException(env, NULL); jniThrowNullPointerException(env, NULL);
return; return;
} }
SLog::readEvents(env, ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK, 0, out); SLog::readEvents(env, ANDROID_LOG_NONBLOCK, 0, out);
} }
static void android_app_admin_SecurityLog_readEventsSince(JNIEnv* env, jobject /* clazz */, static void android_app_admin_SecurityLog_readEventsSince(JNIEnv* env, jobject /* clazz */,
@@ -52,7 +52,7 @@ static void android_app_admin_SecurityLog_readEventsSince(JNIEnv* env, jobject /
jniThrowNullPointerException(env, NULL); jniThrowNullPointerException(env, NULL);
return; return;
} }
SLog::readEvents(env, ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK, timestamp, out); SLog::readEvents(env, ANDROID_LOG_NONBLOCK, timestamp, out);
} }
static void android_app_admin_SecurityLog_readPreviousEvents(JNIEnv* env, jobject /* clazz */, static void android_app_admin_SecurityLog_readPreviousEvents(JNIEnv* env, jobject /* clazz */,
@@ -62,7 +62,7 @@ static void android_app_admin_SecurityLog_readPreviousEvents(JNIEnv* env, jobjec
jniThrowNullPointerException(env, NULL); jniThrowNullPointerException(env, NULL);
return; return;
} }
SLog::readEvents(env, ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK | ANDROID_LOG_PSTORE, 0, out); SLog::readEvents(env, ANDROID_LOG_NONBLOCK | ANDROID_LOG_PSTORE, 0, out);
} }
static void android_app_admin_SecurityLog_readEventsOnWrapping(JNIEnv* env, jobject /* clazz */, static void android_app_admin_SecurityLog_readEventsOnWrapping(JNIEnv* env, jobject /* clazz */,
@@ -72,8 +72,7 @@ static void android_app_admin_SecurityLog_readEventsOnWrapping(JNIEnv* env, jobj
jniThrowNullPointerException(env, NULL); jniThrowNullPointerException(env, NULL);
return; return;
} }
SLog::readEvents(env, ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK | ANDROID_LOG_WRAP, timestamp, SLog::readEvents(env, ANDROID_LOG_NONBLOCK | ANDROID_LOG_WRAP, timestamp, out);
out);
} }
/* /*

5
core/jni/android_util_EventLog.cpp
View File

@@ -44,7 +44,7 @@ static void android_util_EventLog_readEvents(JNIEnv* env, jobject clazz ATTRIBUT
return; return;
} }
ELog::readEvents(env, ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK, tags, 0, out); ELog::readEvents(env, ANDROID_LOG_NONBLOCK, tags, 0, out);
} }
/* /*
* In class android.util.EventLog: * In class android.util.EventLog:
@@ -60,8 +60,7 @@ static void android_util_EventLog_readEventsOnWrapping(JNIEnv* env, jobject claz
jniThrowNullPointerException(env, NULL); jniThrowNullPointerException(env, NULL);
return; return;
} }
ELog::readEvents(env, ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK | ANDROID_LOG_WRAP, tags, ELog::readEvents(env, ANDROID_LOG_NONBLOCK | ANDROID_LOG_WRAP, tags, timestamp, out);
timestamp, out);
} }
/* /*