diff options
author | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-08-07 13:41:08 +0000 |
---|---|---|
committer | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-08-07 13:41:08 +0000 |
commit | 678e3ecc937c00969830700dffb42fb1ee232f7c (patch) | |
tree | 98c7144f8cca3b46411549aad4bbdcaa5376df00 /wifi | |
parent | 1386627335a79dd02fb34db344e63ca3abfce013 (diff) | |
download | frameworks_base-678e3ecc937c00969830700dffb42fb1ee232f7c.zip frameworks_base-678e3ecc937c00969830700dffb42fb1ee232f7c.tar.gz frameworks_base-678e3ecc937c00969830700dffb42fb1ee232f7c.tar.bz2 |
Revert "Update Trusted Credentials screen in settings"
This reverts commit 4fde5aa9fab931d9becfc49f7d7b8526ad5640d9.
Change-Id: I581c38d64e9829b0079bafa42615f2aa0bf64763
Diffstat (limited to 'wifi')
-rw-r--r-- | wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java b/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java index b3b013e..b9b17eb 100644 --- a/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java +++ b/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java @@ -28,7 +28,6 @@ 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; @@ -352,6 +351,34 @@ 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; |