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

Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265

Change-Id: Ie010e23484d9ec7ad31631d72292cc52c96f2c10
This commit is contained in:
Lorenzo Colitti
2021-03-18 13:50:18 +00:00
committed by Automerger Merge Worker
parent ec138734a7 96d66bb7b8
commit 6ace66ed21
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/net/java/android/net/VpnTransportInfoTest.java
View File

@@ -42,7 +42,13 @@ public class VpnTransportInfoTest {
VpnTransportInfo v1 = new VpnTransportInfo(VpnManager.TYPE_VPN_PLATFORM); VpnTransportInfo v1 = new VpnTransportInfo(VpnManager.TYPE_VPN_PLATFORM);
VpnTransportInfo v2 = new VpnTransportInfo(VpnManager.TYPE_VPN_SERVICE); VpnTransportInfo v2 = new VpnTransportInfo(VpnManager.TYPE_VPN_SERVICE);
VpnTransportInfo v3 = new VpnTransportInfo(VpnManager.TYPE_VPN_PLATFORM); VpnTransportInfo v3 = new VpnTransportInfo(VpnManager.TYPE_VPN_PLATFORM);
VpnTransportInfo v4 = new VpnTransportInfo(VpnManager.TYPE_VPN_LEGACY);
VpnTransportInfo v5 = new VpnTransportInfo(VpnManager.TYPE_VPN_OEM);
assertNotEquals(v1, v2); assertNotEquals(v1, v2);
assertNotEquals(v3, v4);
assertNotEquals(v4, v5);
assertEquals(v1, v3); assertEquals(v1, v3);
assertEquals(v1.hashCode(), v3.hashCode()); assertEquals(v1.hashCode(), v3.hashCode());
} }