| commit | b13973838a38e2fe9da7f23f75251704468a867c | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Mon Mar 15 02:07:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 15 02:07:39 2021 +0000 |
| tree | 2e61ada7456000443f96f94921549378b7b47933 | |
| parent | 64f37fc02dfe070a6e5b508237337ce5ca19dd8c [diff] | |
| parent | e7ea40527a2beaaec296e5c5853baa41ee8f1c37 [diff] |
Merge "Remove VpnType usage in VpnTransportInfo" am: e7ea40527a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629273 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I41431bfba97a6fe0678b9a5dc72b19479d5d4c66
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; }