1 files changed, 58 insertions, 5 deletions

diff --git a/wifi/java/android/net/wifi/passpoint/PasspointOsuProvider.java b/wifi/java/android/net/wifi/passpoint/PasspointOsuProvider.java
index b896307..80d5315 100644
--- a/wifi/java/android/net/wifi/passpoint/PasspointOsuProvider.java
+++ b/wifi/java/android/net/wifi/passpoint/PasspointOsuProvider.java
@@ -25,13 +25,16 @@ import android.os.Parcelable;
 public class PasspointOsuProvider implements Parcelable {
 
     /** TODO: doc */
+    public static final int OSU_METHOD_UNKNOWN = -1;
+
+    /** TODO: doc */
     public static final int OSU_METHOD_OMADM = 0;
 
     /** TODO: doc */
     public static final int OSU_METHOD_SOAP = 1;
 
     /** TODO: doc */
-    public String SSID;
+    public String ssid;
 
     /** TODO: doc */
     public String friendlyName;
@@ -40,7 +43,16 @@ public class PasspointOsuProvider implements Parcelable {
     public String serverUri;
 
     /** TODO: doc */
-    public int osuMethod;
+    public int osuMethod = OSU_METHOD_UNKNOWN;
+
+    /** TODO: doc */
+    public int iconWidth;
+
+    /** TODO: doc */
+    public int iconHeight;
+
+    /** TODO: doc */
+    public String iconType;
 
     /** TODO: doc */
     public String iconFileName;
@@ -66,13 +78,45 @@ public class PasspointOsuProvider implements Parcelable {
     }
 
     @Override
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("SSID: ").append(ssid);
+        if (friendlyName != null)
+            sb.append(" friendlyName: ").append(friendlyName);
+        if (serverUri != null)
+            sb.append(" serverUri: ").append(serverUri);
+        sb.append(" osuMethod: ").append(osuMethod);
+        if (iconFileName != null) {
+            sb.append(" icon: [").append(iconWidth).append("x")
+              .append(iconHeight).append(" ")
+              .append(iconType).append(" ")
+              .append(iconFileName);
+        }
+        if (osuNai != null)
+            sb.append(" osuNai: ").append(osuNai);
+        if (osuService != null)
+            sb.append(" osuService: ").append(osuService);
+        return sb.toString();
+    }
+
+    @Override
     public int describeContents() {
         return 0;
     }
 
     @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        // TODO
+    public void writeToParcel(Parcel out, int flags) {
+        out.writeValue(ssid);
+        out.writeValue(friendlyName);
+        out.writeValue(serverUri);
+        out.writeInt(osuMethod);
+        out.writeInt(iconWidth);
+        out.writeInt(iconHeight);
+        out.writeValue(iconType);
+        out.writeValue(iconFileName);
+        out.writeValue(osuNai);
+        out.writeValue(osuService);
+        // TODO: icon image?
     }
 
     public static final Parcelable.Creator<PasspointOsuProvider> CREATOR =
@@ -80,7 +124,16 @@ public class PasspointOsuProvider implements Parcelable {
         @Override
         public PasspointOsuProvider createFromParcel(Parcel in) {
             PasspointOsuProvider osu = new PasspointOsuProvider();
-            // TODO
+            osu.ssid = (String) in.readValue(String.class.getClassLoader());
+            osu.friendlyName = (String) in.readValue(String.class.getClassLoader());
+            osu.serverUri = (String) in.readValue(String.class.getClassLoader());
+            osu.osuMethod = in.readInt();
+            osu.iconWidth = in.readInt();
+            osu.iconHeight = in.readInt();
+            osu.iconType = (String) in.readValue(String.class.getClassLoader());
+            osu.iconFileName = (String) in.readValue(String.class.getClassLoader());
+            osu.osuNai = (String) in.readValue(String.class.getClassLoader());
+            osu.osuService = (String) in.readValue(String.class.getClassLoader());
             return osu;
         }