Merge "Add native_dump to the Dependencies"

This commit is contained in:
Motomu Utsumi 2022-09-16 01:23:22 +00:00 • committed by Gerrit Code Review
commit db3accc65a

View file

@ -294,6 +294,13 @@ public class BpfNetMaps {
return ConnectivityStatsLog.buildStatsEvent(NETWORK_BPF_MAP_INFO, cookieTagMapSize,
uidOwnerMapSize, uidPermissionMapSize);
}
/**
* Call native_dump
*/
public void nativeDump(final FileDescriptor fd, final boolean verbose) {
native_dump(fd, verbose);
}
}
/** Constructor used after T that doesn't need to use netd anymore. */
@ -920,7 +927,7 @@ public class BpfNetMaps {
EOPNOTSUPP, "dumpsys connectivity trafficcontroller dump not available on pre-T"
+ " devices, use dumpsys netd trafficcontroller instead.");
}
native_dump(fd, verbose);
mDeps.nativeDump(fd, verbose);
}
private static native void native_init(boolean startSkDestroyListener);
@ -936,6 +943,6 @@ public class BpfNetMaps {
private native int native_updateUidLockdownRule(int uid, boolean add);
private native int native_swapActiveStatsMap();
private native void native_setPermissionForUids(int permissions, int[] uids);
private native void native_dump(FileDescriptor fd, boolean verbose);
private static native void native_dump(FileDescriptor fd, boolean verbose);
private static native int native_synchronizeKernelRCU();
}