am 08390bf9: am 1d128a5a: am 856e0928: Merge "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" into lmp-dev

* commit '08390bf9cb75bfb2987a480166d02f672afa8ba1':
  Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""

1 files changed, 1 insertions, 28 deletions

diff --git a/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java b/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java
index b9b17eb..b3b013e 100644
--- a/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java
+++ b/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java
@@ -28,6 +28,7 @@ import android.os.RemoteException;
 import android.util.Log;
 
 import com.android.internal.util.AsyncChannel;
+import com.android.internal.util.ParcelableString;
 import com.android.internal.util.Protocol;
 
 import java.util.ArrayList;
@@ -351,34 +352,6 @@ public class WifiPasspointManager {
 
     }
 
-    public static class ParcelableString implements Parcelable {
-        public String string;
-
-        @Override
-        public int describeContents() {
-            return 0;
-        }
-
-        @Override
-        public void writeToParcel(Parcel out, int flags) {
-            out.writeString(string);
-        }
-
-        public static final Parcelable.Creator<ParcelableString> CREATOR =
-                new Parcelable.Creator<ParcelableString>() {
-                    @Override
-                    public ParcelableString createFromParcel(Parcel in) {
-                        ParcelableString ret = new ParcelableString();
-                        ret.string = in.readString();
-                        return ret;
-                    }
-                    @Override
-                    public ParcelableString[] newArray(int size) {
-                        return new ParcelableString[size];
-                    }
-        };
-    }
-
     private static final int BASE = Protocol.BASE_WIFI_PASSPOINT_MANAGER;
 
     public static final int REQUEST_ANQP_INFO                   = BASE + 1;