LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "remove spurious 'struct' on Stats" am: fa88e27173 am: 39b66243ee

Browse Source 
Change-Id: I42b04ea2b7a3381b15d49bb6d6ef644277925515
This commit is contained in:
Automerger Merge Worker
2020-01-06 15:20:29 +00:00
parent af83fe4801 fa88e27173
commit 16605fc29d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/jni/com_android_server_net_NetworkStatsService.cpp
View File

@@ -54,7 +54,7 @@ enum StatsType {
TCP_TX_PACKETS = 5
};
static uint64_t getStatsType(struct Stats* stats, StatsType type) {
static uint64_t getStatsType(Stats* stats, StatsType type) {
switch (type) {
case RX_BYTES:
return stats->rxBytes;
@@ -73,7 +73,7 @@ static uint64_t getStatsType(struct Stats* stats, StatsType type) {
}
}
static int parseIfaceStats(const char* iface, struct Stats* stats) {
static int parseIfaceStats(const char* iface, Stats* stats) {
FILE *fp = fopen(QTAGUID_IFACE_STATS, "r");
if (fp == NULL) {
return -1;
@@ -117,7 +117,7 @@ static int parseIfaceStats(const char* iface, struct Stats* stats) {
return 0;
}
static int parseUidStats(const uint32_t uid, struct Stats* stats) {
static int parseUidStats(const uint32_t uid, Stats* stats) {
FILE *fp = fopen(QTAGUID_UID_STATS, "r");
if (fp == NULL) {
return -1;
@@ -150,7 +150,7 @@ static int parseUidStats(const uint32_t uid, struct Stats* stats) {
}
static jlong getTotalStat(JNIEnv* env, jclass clazz, jint type, jboolean useBpfStats) {
struct Stats stats;
Stats stats;
memset(&stats, 0, sizeof(Stats));
if (useBpfStats) {
@@ -175,7 +175,7 @@ static jlong getIfaceStat(JNIEnv* env, jclass clazz, jstring iface, jint type,
return UNKNOWN;
}
struct Stats stats;
Stats stats;
memset(&stats, 0, sizeof(Stats));
if (useBpfStats) {
@@ -194,7 +194,7 @@ static jlong getIfaceStat(JNIEnv* env, jclass clazz, jstring iface, jint type,
}
static jlong getUidStat(JNIEnv* env, jclass clazz, jint uid, jint type, jboolean useBpfStats) {
struct Stats stats;
Stats stats;
memset(&stats, 0, sizeof(Stats));
if (useBpfStats) {