From 1386627335a79dd02fb34db344e63ca3abfce013 Mon Sep 17 00:00:00 2001 From: Zoltan Szatmary-Ban Date: Tue, 15 Jul 2014 16:58:59 +0100 Subject: Update Trusted Credentials screen in settings Trusted credentials for both the primary user and its managed profiles are shown on the Trusted Credentials fragment. All functionalities (e.g. disabling/enabling of certificates) remain available. Bug: 16029580 Change-Id: Ia92ae02d8c572bf4a3be172f6c255726cefc0fa1 --- .../net/wifi/passpoint/WifiPasspointManager.java | 29 +--------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'wifi') 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 CREATOR = - new Parcelable.Creator() { - @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; -- cgit v1.1