diff options
author | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-08-15 12:52:35 +0000 |
---|---|---|
committer | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-08-15 12:58:37 +0000 |
commit | f8d72cc14f70f5af13342c4c7b107a8ab60dfe23 (patch) | |
tree | 57ac8e36c84cb0d3628535c9ffc96094c5bda61f /wifi/java/android/net/wifi/passpoint | |
parent | f75aadc028f2e79541a269bf2c74dcb3482e2ec7 (diff) | |
download | frameworks_base-f8d72cc14f70f5af13342c4c7b107a8ab60dfe23.zip frameworks_base-f8d72cc14f70f5af13342c4c7b107a8ab60dfe23.tar.gz frameworks_base-f8d72cc14f70f5af13342c4c7b107a8ab60dfe23.tar.bz2 |
Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""
This reverts commit 87efe74e092236c372d3b6909009641123aa416a.
This should be fine now with all the dependency CLs +2-ed
Change-Id: I96ad14ad5ff81e6b5391035cb6c5a62339c6cc40
Diffstat (limited to 'wifi/java/android/net/wifi/passpoint')
-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 b2b5310..056f5df 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; @@ -296,34 +297,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; |