| commit | b9db8b990516a10e6e45880f0c0067a00632232a | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Mon Mar 15 03:30:53 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 15 03:30:53 2021 +0000 |
| tree | 1f132ca15fbff01cd2e2e2313db3a181999b77d5 | |
| parent | e30d05f314cc4edbe83e963cca7c8d261f753971 [diff] | |
| parent | 231fb3a246a571c5556c0b6665aa0b060cb3e69a [diff] |
Merge "Remove VpnType usage in VpnTransportInfo" am: e7ea40527a am: b13973838a am: 231fb3a246 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629273 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia2c66e0c97bc383237782f6116398b225c26e3ea
diff --git a/framework/src/android/net/VpnTransportInfo.java b/framework/src/android/net/VpnTransportInfo.java index 340141b..c510079 100644 --- a/framework/src/android/net/VpnTransportInfo.java +++ b/framework/src/android/net/VpnTransportInfo.java
@@ -42,9 +42,9 @@ MessageUtils.findMessageNames(new Class[]{VpnManager.class}, new String[]{"TYPE_VPN_"}); /** Type of this VPN. */ - @VpnManager.VpnType public final int type; + public final int type; - public VpnTransportInfo(@VpnManager.VpnType int type) { + public VpnTransportInfo(int type) { this.type = type; }