commit 032cd3914aee9b6ee9033eda7e887149c3095a3e
author Remi NGUYEN VAN <reminv@google.com> Wed Mar 17 00:14:10 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 17 00:14:10 2021 +0000
tree 3089f78d60fd532d69c82a5a4b87f13071919e9b
parent 8a267598d5ae7c713f9fd30d6c20d463f7ed3e8e
parent e642d483a46b4fad328adce65d0e4d01674e654e

Merge "Remove MessageUtils usage in VpnTransportInfo"

framework/src/android/net/VpnTransportInfo.java

diff --git a/framework/src/android/net/VpnTransportInfo.java b/framework/src/android/net/VpnTransportInfo.java
index c510079..cd8f4c0 100644
--- a/framework/src/android/net/VpnTransportInfo.java
+++ b/framework/src/android/net/VpnTransportInfo.java
@@ -22,9 +22,6 @@
 import android.annotation.SystemApi;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.util.SparseArray;
-
-import com.android.internal.util.MessageUtils;
 
 import java.util.Objects;
 
@@ -38,9 +35,6 @@
  */
 @SystemApi(client = MODULE_LIBRARIES)
 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. */
     public final int type;
 
@@ -63,8 +57,7 @@
 
     @Override
     public String toString() {
-        final String typeString = sTypeToString.get(type, "VPN_TYPE_???");
-        return String.format("VpnTransportInfo{%s}", typeString);
+        return String.format("VpnTransportInfo{type=%d}", type);
     }
 
     @Override