summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net/wifi/passpoint
diff options
context:
space:
mode:
authorZoltan Szatmary-Ban <szatmz@google.com>2014-08-15 11:52:15 +0000
committerZoltan Szatmary-Ban <szatmz@google.com>2014-08-15 12:55:35 +0100
commit1e7bc0def8c62b91d3eb985a51bec54063ce83f5 (patch)
tree57ac8e36c84cb0d3628535c9ffc96094c5bda61f /wifi/java/android/net/wifi/passpoint
parent4b2d0f20db2e0f9395a0c12ed5d4b6020eb272cb (diff)
downloadframeworks_base-1e7bc0def8c62b91d3eb985a51bec54063ce83f5.zip
frameworks_base-1e7bc0def8c62b91d3eb985a51bec54063ce83f5.tar.gz
frameworks_base-1e7bc0def8c62b91d3eb985a51bec54063ce83f5.tar.bz2
Revert "Revert "Update Trusted Credentials screen in settings""
This reverts commit 0f0de0bdd021bad5f85fdb0399a4ea91a1611e25. Change-Id: Ia3d0907e3d7c2ec42d64e45f60e3dfaffb932c3d
Diffstat (limited to 'wifi/java/android/net/wifi/passpoint')
-rw-r--r--wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java29
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;