diff options
author | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-08-15 14:44:23 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-15 14:44:23 +0000 |
commit | d7d06fed4063bf6e0c5f6c0fd216ac229d5b6ace (patch) | |
tree | 43e28c8a38afba9aab1ecbb9f14a2b3cd47e08b6 /wifi | |
parent | c4b3dfd1621176ff0b8628c557cf5b0cc90dd78d (diff) | |
parent | b828e094c1d77892898a524009f82ad6559245ab (diff) | |
download | frameworks_base-d7d06fed4063bf6e0c5f6c0fd216ac229d5b6ace.zip frameworks_base-d7d06fed4063bf6e0c5f6c0fd216ac229d5b6ace.tar.gz frameworks_base-d7d06fed4063bf6e0c5f6c0fd216ac229d5b6ace.tar.bz2 |
am bcdd58c5: am e21dd346: am 3e941c33: Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev
* commit 'bcdd58c572a81477a14c8a670739066783492bc3':
Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""
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; |