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

Commit 35bf55fa authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "Remove ANDROID_LOG_RDONLY" am: f87fe63a 

Change-Id: I14564e1abafc586d18b10f0d0f7703433f430fcc
parents 96aacad6 f87fe63a

cmds/incidentd/src/Section.cpp

+2 −2
Original line number Diff line number Diff line
@@ -512,8 +512,8 @@ status_t LogSection::BlockingCall(int pipeWriteFd) const { 
    // Open log buffer and getting logs since last retrieved time if any.

    unique_ptr<logger_list, void (*)(logger_list*)> loggers(

            gLastLogsRetrieved.find(mLogID) == gLastLogsRetrieved.end()

                    ? android_logger_list_alloc(ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK, 0, 0)

                    : android_logger_list_alloc_time(ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK,

                    ? android_logger_list_alloc(ANDROID_LOG_NONBLOCK, 0, 0)

                    : android_logger_list_alloc_time(ANDROID_LOG_NONBLOCK,

                                                     gLastLogsRetrieved[mLogID], 0),

            android_logger_list_free);

core/jni/android_app_admin_SecurityLog.cpp

+4 −5
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static void android_app_admin_SecurityLog_readEvents(JNIEnv* env, jobject /* cla 
        jniThrowNullPointerException(env, NULL);

        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 */,
@@ -52,7 +52,7 @@ static void android_app_admin_SecurityLog_readEventsSince(JNIEnv* env, jobject / 
        jniThrowNullPointerException(env, NULL);

        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 */,
@@ -62,7 +62,7 @@ static void android_app_admin_SecurityLog_readPreviousEvents(JNIEnv* env, jobjec 
        jniThrowNullPointerException(env, NULL);

        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 */,
@@ -72,8 +72,7 @@ static void android_app_admin_SecurityLog_readEventsOnWrapping(JNIEnv* env, jobj 
        jniThrowNullPointerException(env, NULL);

        return;

    }

    SLog::readEvents(env, ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK | ANDROID_LOG_WRAP, timestamp,

            out);

    SLog::readEvents(env, ANDROID_LOG_NONBLOCK | ANDROID_LOG_WRAP, timestamp, out);

}



/*

core/jni/android_util_EventLog.cpp

+2 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static void android_util_EventLog_readEvents(JNIEnv* env, jobject clazz ATTRIBUT 
        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:
@@ -60,8 +60,7 @@ static void android_util_EventLog_readEventsOnWrapping(JNIEnv* env, jobject claz 
        jniThrowNullPointerException(env, NULL);

        return;

    }

    ELog::readEvents(env, ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK | ANDROID_LOG_WRAP, tags,

            timestamp, out);

    ELog::readEvents(env, ANDROID_LOG_NONBLOCK | ANDROID_LOG_WRAP, tags, timestamp, out);

}



/*