diff options
author | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-08-15 13:39:57 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-15 13:39:57 +0000 |
commit | 55083f240b828d9bb07fc4ec98ea846e171d6ece (patch) | |
tree | c0b43c0ce1f659f794d59ee334f16990c70250fd /wifi | |
parent | 6a992250415a1f39cdba21f1bc7cc8819f6b8f1a (diff) | |
parent | 45bdce5df598fa6ccf9999148a725f0f5b08146c (diff) | |
download | frameworks_base-55083f240b828d9bb07fc4ec98ea846e171d6ece.zip frameworks_base-55083f240b828d9bb07fc4ec98ea846e171d6ece.tar.gz frameworks_base-55083f240b828d9bb07fc4ec98ea846e171d6ece.tar.bz2 |
am a6e86ddf: am fe2114b4: am 19c8ce29: Revert "Revert "Update Trusted Credentials screen in settings""
* commit 'a6e86ddfd0e5eccd8657c18554cfd6ccd86608f3':
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, 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; |