commit 36ad8fed76198f3df55d1927f187b5c93ad5ff33
author Chiachang Wang <chiachangwang@google.com> Thu Apr 20 13:21:03 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 20 13:21:03 2023 +0000
tree 4e5282a024c6e0b8c3e2357109ee03b8d1693e76
parent 40bb79a3771320dee2e78c356b4fd389b245bece
parent 1c370c647a3b6a598577a8741034929ece818cce

Merge "Remove unnecessary mocking in tearDown" am: 520417cc3e am: 1c370c647a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2550152

Change-Id: I9d8b1b2126c3c3ec2e3e3bc0a96f94af26d74577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/unit/java/com/android/server/connectivity/VpnTest.java

diff --git a/tests/unit/java/com/android/server/connectivity/VpnTest.java b/tests/unit/java/com/android/server/connectivity/VpnTest.java
index c599d9d..2926c9a 100644
--- a/tests/unit/java/com/android/server/connectivity/VpnTest.java
+++ b/tests/unit/java/com/android/server/connectivity/VpnTest.java
@@ -179,7 +179,6 @@
 import com.android.testutils.DevSdkIgnoreRule;
 import com.android.testutils.DevSdkIgnoreRunner;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -434,11 +433,6 @@
                 .thenReturn(ikeSession);
     }
 
-    @After
-    public void tearDown() throws Exception {
-        doReturn(PERMISSION_DENIED).when(mContext).checkCallingOrSelfPermission(any());
-    }
-
     private <T> void mockService(Class<T> clazz, String name, T service) {
         doReturn(service).when(mContext).getSystemService(name);
         doReturn(name).when(mContext).getSystemServiceName(clazz);