| commit | 453d24ba8207ad8e473eda7f9b13277345ea1adf | [log] [tgz] |
|---|---|---|
| author | Mark Chien <markchien@google.com> | Fri Dec 08 08:15:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 08 08:15:44 2023 +0000 |
| tree | 6d53423aedced966321dd4564491da721209cae6 | |
| parent | 07f8eac855bd1c33a122e12db826c7783e82ba36 [diff] | |
| parent | ce6f14073cf412c8aca91f887ac1617633fb004a [diff] |
Merge "Get rid of any unnecessary reset calls" into main am: ce6f14073c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2865435 Change-Id: Ib49434f5b3d0a47ac29a33fdf09150d912815018 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/UpstreamNetworkMonitorTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/UpstreamNetworkMonitorTest.java index 045c0cb..90fd709 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/UpstreamNetworkMonitorTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/UpstreamNetworkMonitorTest.java
@@ -108,9 +108,6 @@ @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - reset(mContext); - reset(mCS); - reset(mLog); when(mLog.forSubComponent(anyString())).thenReturn(mLog); when(mEntitleMgr.isCellularUpstreamPermitted()).thenReturn(true);