Merge "Expose VpnTransportInfo as module-lib API."

1 files changed, 0 insertions, 79 deletions

diff --git a/core/java/android/net/VpnTransportInfo.java b/core/java/android/net/VpnTransportInfo.java
deleted file mode 100644
index 082fa58f8ac2..000000000000
--- a/core/java/android/net/VpnTransportInfo.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net;
-
-import android.annotation.NonNull;
-import android.annotation.Nullable;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.util.SparseArray;
-
-import com.android.internal.util.MessageUtils;
-
-import java.util.Objects;
-
-/** @hide */
-public final class VpnTransportInfo implements TransportInfo, Parcelable {
-    private static final SparseArray<String> sTypeToString =
-            MessageUtils.findMessageNames(new Class[]{VpnManager.class}, new String[]{"TYPE_VPN_"});
-
-    /** Type of this VPN. */
-    @VpnManager.VpnType public final int type;
-
-    public VpnTransportInfo(@VpnManager.VpnType int type) {
-        this.type = type;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof VpnTransportInfo)) return false;
-
-        VpnTransportInfo that = (VpnTransportInfo) o;
-        return this.type == that.type;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(type);
-    }
-
-    @Override
-    public String toString() {
-        final String typeString = sTypeToString.get(type, "VPN_TYPE_???");
-        return String.format("VpnTransportInfo{%s}", typeString);
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(@NonNull Parcel dest, int flags) {
-        dest.writeInt(type);
-    }
-
-    public static final @NonNull Creator<VpnTransportInfo> CREATOR =
-            new Creator<VpnTransportInfo>() {
-        public VpnTransportInfo createFromParcel(Parcel in) {
-            return new VpnTransportInfo(in.readInt());
-        }
-        public VpnTransportInfo[] newArray(int size) {
-            return new VpnTransportInfo[size];
-        }
-    };
-}