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

Commit cffab98f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove ANDROID_LOG_RDONLY" into rvc-dev-plus-aosp am: 0ee929f2 

Change-Id: I470814b57d013bbb1ddda8c910c8946b21189c10
parents 9e8e9108 0ee929f2

cmds/incidentd/src/Section.h

+2 −2
Original line number Diff line number Diff line
@@ -164,8 +164,8 @@ class LogSection : public WorkerThreadSection { 
    // global last log retrieved timestamp for each log_id_t.

    static map<log_id_t, log_time> gLastLogsRetrieved;



    // log mode: read only & non blocking.

    const static int logModeBase = ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK;

    // log mode: non blocking.

    const static int logModeBase = ANDROID_LOG_NONBLOCK;



public:

    LogSection(int id, const char* logID, ...);

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);

}



/*