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

Commit aeeea3da authored by Dan Egnor's avatar Dan Egnor Committed by Android Git Automerger
Browse files

am 505f22d1: am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo 

Merge commit '505f22d1' into kraken

* commit '505f22d1':
  Fix sim build (sim doesn't have strl*() reliably...)
parents 53f772ed 505f22d1

core/jni/android_net_TrafficStats.cpp

+8 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ namespace android { 


// Returns an ASCII decimal number read from the specified file, -1 on error.

static jlong readNumber(char const* filename) {

#ifdef HAVE_ANDROID_OS

    char buf[80];

    int fd = open(filename, O_RDONLY);

    if (fd < 0) {
@@ -49,6 +50,9 @@ static jlong readNumber(char const* filename) { 
    close(fd);

    buf[len] = '\0';

    return atoll(buf);

#else  // Simulator

    return -1;

#endif

}



// Return the number from the first file which exists and contains data
@@ -60,6 +64,7 @@ static jlong tryBoth(char const* a, char const* b) { 
// Returns the sum of numbers from the specified path under /sys/class/net/*,

// -1 if no such file exists.

static jlong readTotal(char const* suffix) {

#ifdef HAVE_ANDROID_OS

    char filename[PATH_MAX] = "/sys/class/net/";

    DIR *dir = opendir(filename);

    if (dir == NULL) {
@@ -81,6 +86,9 @@ static jlong readTotal(char const* suffix) { 


    closedir(dir);

    return total;

#else  // Simulator

    return -1;

#endif

}



// Mobile stats get accessed a lot more often than total stats.