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

Commit 13f3683d authored by Elliott Hughes's avatar Elliott Hughes Committed by Android (Google) Code Review
Browse files

Merge "More native code cleanup."

parents f9dc3db2 f17b971a

core/jni/android_net_TrafficStats.cpp

+8 −6
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <android_runtime/AndroidRuntime.h>

#include <cutils/logger.h>

#include <jni.h>

#include <ScopedUtfChars.h>

#include <utils/misc.h>

#include <utils/Log.h>
@@ -130,13 +131,14 @@ static jlong getMobileRxBytes(JNIEnv* env, jobject clazz) { 
            "/sys/class/net/ppp0/statistics/rx_bytes");

}



static jlong getData(JNIEnv* env, char *what, jstring interface) {

    char filename[80];

    jboolean isCopy;



    const char *interfaceStr = env->GetStringUTFChars(interface, &isCopy);

    snprintf(filename, sizeof(filename), "/sys/class/net/%s/statistics/%s", interfaceStr, what);

static jlong getData(JNIEnv* env, const char* what, jstring javaInterface) {

    ScopedUtfChars interface(env, javaInterface);

    if (interface.c_str() == NULL) {

        return -1;

    }



    char filename[80];

    snprintf(filename, sizeof(filename), "/sys/class/net/%s/statistics/%s", interface.c_str(), what);

    return readNumber(filename);

}

core/jni/android_net_wifi_Wifi.cpp

+169 −242

File changed.

Preview size limit exceeded, changes collapsed.