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

Merge changes from topic "idiag_sock_id"

Browse Source 
* changes:
  Switch SkDestroyListener based on the flag.
  Add startSkDestroyListener flag to native_init
  Add SkDestroyListenerTest
This commit is contained in:
Motomu Utsumi
2022-09-10 02:02:11 +00:00
committed by Gerrit Code Review
parent 3dc2fb5378 d95a0dafa8
commit 08ccd0d2e1
9 changed files with 249 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
View File

@@ -143,6 +143,7 @@ import com.android.net.module.util.Struct.U32;
import com.android.net.module.util.Struct.U8;
import com.android.net.module.util.bpf.CookieTagMapKey;
import com.android.net.module.util.bpf.CookieTagMapValue;
import com.android.server.BpfNetMaps;
import com.android.server.net.NetworkStatsService.AlertObserver;
import com.android.server.net.NetworkStatsService.NetworkStatsSettings;
import com.android.server.net.NetworkStatsService.NetworkStatsSettings.Config;
@@ -249,6 +250,10 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
@Mock
private LocationPermissionChecker mLocationPermissionChecker;
private TestBpfMap<U32, U8> mUidCounterSetMap = spy(new TestBpfMap<>(U32.class, U8.class));
@Mock
private BpfNetMaps mBpfNetMaps;
@Mock
private SkDestroyListener mSkDestroyListener;
private TestBpfMap<CookieTagMapKey, CookieTagMapValue> mCookieTagMap = new TestBpfMap<>(
CookieTagMapKey.class, CookieTagMapValue.class);
@@ -501,6 +506,17 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
public boolean isDebuggable() {
return mIsDebuggable == Boolean.TRUE;
}
@Override
public BpfNetMaps makeBpfNetMaps(Context ctx) {
return mBpfNetMaps;
}
@Override
public SkDestroyListener makeSkDestroyListener(
IBpfMap<CookieTagMapKey, CookieTagMapValue> cookieTagMap, Handler handler) {
return mSkDestroyListener;
}
};
}