Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix log message when failing to open bpf maps" am: 5a5a4504a5 am: a05ac6b101

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972640

Change-Id: Ifd2f2738fbbadb49a3ee7d838174848ba83e130d
This commit is contained in:
Maciej Żenczykowski
2022-03-08 19:58:19 +00:00
committed by Automerger Merge Worker
parent 4f64366984 a05ac6b101
commit 3cd813bda3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java
View File

@@ -565,7 +565,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
return new BpfMap<U32, U8>(UID_COUNTERSET_MAP_PATH, BpfMap.BPF_F_RDWR,
U32.class, U8.class);
} catch (ErrnoException e) {
Log.wtf(TAG, "Cannot create uid counter set map: " + e);
Log.wtf(TAG, "Cannot open uid counter set map: " + e);
return null;
}
}
@@ -576,7 +576,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
return new BpfMap<CookieTagMapKey, CookieTagMapValue>(COOKIE_TAG_MAP_PATH,
BpfMap.BPF_F_RDWR, CookieTagMapKey.class, CookieTagMapValue.class);
} catch (ErrnoException e) {
Log.wtf(TAG, "Cannot create cookie tag map: " + e);
Log.wtf(TAG, "Cannot open cookie tag map: " + e);
return null;
}
}
@@ -587,7 +587,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
return new BpfMap<StatsMapKey, StatsMapValue>(STATS_MAP_A_PATH,
BpfMap.BPF_F_RDWR, StatsMapKey.class, StatsMapValue.class);
} catch (ErrnoException e) {
Log.wtf(TAG, "Cannot create stats map A: " + e);
Log.wtf(TAG, "Cannot open stats map A: " + e);
return null;
}
}
@@ -598,7 +598,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
return new BpfMap<StatsMapKey, StatsMapValue>(STATS_MAP_B_PATH,
BpfMap.BPF_F_RDWR, StatsMapKey.class, StatsMapValue.class);
} catch (ErrnoException e) {
Log.wtf(TAG, "Cannot create stats map B: " + e);
Log.wtf(TAG, "Cannot open stats map B: " + e);
return null;
}
}
@@ -609,7 +609,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
return new BpfMap<UidStatsMapKey, StatsMapValue>(APP_UID_STATS_MAP_PATH,
BpfMap.BPF_F_RDWR, UidStatsMapKey.class, StatsMapValue.class);
} catch (ErrnoException e) {
Log.wtf(TAG, "Cannot create app uid stats map: " + e);
Log.wtf(TAG, "Cannot open app uid stats map: " + e);
return null;
}
}