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

Commit f32c8e8c authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Automerger Merge Worker
Browse files

Merge "Fix log message when failing to open bpf maps" am: 5a5a4504 am: a05ac6b1 am: 3cd813bd 

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

Change-Id: If02e401468e8f4cecdc46c92e87ce8fdb8f4674c
parents 71fe78b4 3cd813bd

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

+5 −5
Original line number Diff line number Diff line
@@ -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;

            }

        }