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

Fix TetheringTest crash on eng build

Browse Source 
startTrackDefaultNetwork was allowed to called multiple times
before even though there is no one actually do it. However,
in the TetheringTest#verifyDefaultNetworkRequestFiled, a
manual invocation is used to ensure that function supports
multiple entrance.

But with aosp/1697371, startTrackDefaultNetwork is no longer
allowed to be called multiple times, it would lead to log.wtf
and crash system in eng build.

Since the manual invocation of startTrackDefaultNetwork is not
realistic and no longer valid anymore, remove the invocation
that caused the trouble.

Test: atest TetheringCoverageTests
Bug: 188613493
Change-Id: I61f6088783d521fd17ae1e87370842b4239fbe75
This commit is contained in:
junyulai
2021-05-19 16:09:12 +08:00
parent a59a146b36
commit 7ba566dbf7
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java
View File

@@ -782,8 +782,6 @@ public class TetheringTest {
assertTrue(TestConnectivityManager.looksLikeDefaultRequest(reqCaptor.getValue())); assertTrue(TestConnectivityManager.looksLikeDefaultRequest(reqCaptor.getValue()));
// The default network request is only ever filed once. // The default network request is only ever filed once.
verifyNoMoreInteractions(mCm); verifyNoMoreInteractions(mCm);
mUpstreamNetworkMonitor.startTrackDefaultNetwork(mEntitleMgr);
verifyNoMoreInteractions(mCm);
} }
private void verifyInterfaceServingModeStarted(String ifname) throws Exception { private void verifyInterfaceServingModeStarted(String ifname) throws Exception {