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

Merge "convert 'Stats stats; memset(&stats, 0, sizeof(Stats));' to 'Stats stats = {};'" am: 30bf98b239 am: d872904d2c

Browse Source 
Change-Id: I6025782d2deea26150c21bc682cca80ceca6148a
This commit is contained in:
Automerger Merge Worker
2020-01-06 15:21:17 +00:00
parent 16605fc29d 30bf98b239
commit 166e658c00
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,8 +150,7 @@ static int parseUidStats(const uint32_t uid, Stats* stats) {
} }
static jlong getTotalStat(JNIEnv* env, jclass clazz, jint type, jboolean useBpfStats) { static jlong getTotalStat(JNIEnv* env, jclass clazz, jint type, jboolean useBpfStats) {
Stats stats; Stats stats = {};
memset(&stats, 0, sizeof(Stats));
if (useBpfStats) { if (useBpfStats) {
if (bpfGetIfaceStats(NULL, &stats) == 0) { if (bpfGetIfaceStats(NULL, &stats) == 0) {
@@ -175,8 +174,7 @@ static jlong getIfaceStat(JNIEnv* env, jclass clazz, jstring iface, jint type,
return UNKNOWN; return UNKNOWN;
} }
Stats stats; Stats stats = {};
memset(&stats, 0, sizeof(Stats));
if (useBpfStats) { if (useBpfStats) {
if (bpfGetIfaceStats(iface8.c_str(), &stats) == 0) { if (bpfGetIfaceStats(iface8.c_str(), &stats) == 0) {
@@ -194,8 +192,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) { static jlong getUidStat(JNIEnv* env, jclass clazz, jint uid, jint type, jboolean useBpfStats) {
Stats stats; Stats stats = {};
memset(&stats, 0, sizeof(Stats));
if (useBpfStats) { if (useBpfStats) {
if (bpfGetUidStats(uid, &stats) == 0) { if (bpfGetUidStats(uid, &stats) == 0) {