| commit | d13a021a4df6e4585b57d87b4dbd7ea431f95ad7 | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Thu Feb 29 03:33:23 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 29 03:33:23 2024 +0000 |
| tree | 821d2b11ad185d83064ea511c843da6c96d7756c | |
| parent | cc08f925d63a09ecedb1031a18f4df3a3da5d48e [diff] | |
| parent | da5845bbea3c7fdd1a337bfa9f6b084d113038c7 [diff] |
Merge "Remove Vpn and LockdownVpnTracker from vpn-jarjar-rules" into main am: da5845bbea Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2981694 Change-Id: Ib746430acd93c576aa23df4b88e9b9ce685e0411 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/unit/vpn-jarjar-rules.txt b/tests/unit/vpn-jarjar-rules.txt index 1a6bddc..f74eab8 100644 --- a/tests/unit/vpn-jarjar-rules.txt +++ b/tests/unit/vpn-jarjar-rules.txt
@@ -1,4 +1,2 @@ # Only keep classes imported by ConnectivityServiceTest -keep com.android.server.connectivity.Vpn keep com.android.server.connectivity.VpnProfileStore -keep com.android.server.net.LockdownVpnTracker