diff options
author | Narayan Kamath <narayan@google.com> | 2014-08-15 13:40:22 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-15 13:40:22 +0000 |
commit | a93fb72f85bbb12ede4d26f26fdc56457c0f8ee2 (patch) | |
tree | 42699b8a7f52265aa5a97632e4c29a8fba63c2af /wifi/java/android/net/wifi/passpoint | |
parent | 1982323f6569b99ac436e112d39b9b368d22a95a (diff) | |
parent | bab1a3f396a103ccbd960c90a3808a2899591cb6 (diff) | |
download | frameworks_base-a93fb72f85bbb12ede4d26f26fdc56457c0f8ee2.zip frameworks_base-a93fb72f85bbb12ede4d26f26fdc56457c0f8ee2.tar.gz frameworks_base-a93fb72f85bbb12ede4d26f26fdc56457c0f8ee2.tar.bz2 |
am 2b83dc1a: am 09f669f0: am a7d930a0: Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev
* commit '2b83dc1a695cec37f372945e6440fa6d9fd598c3':
Revert "Revert "Revert "Update Trusted Credentials screen in settings"""
Diffstat (limited to 'wifi/java/android/net/wifi/passpoint')
-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; |