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: I76200cca5dce8bf2c042a78dcfbf016f14c3f1ab
diff --git a/service/java/com/android/server/wifi/passpoint/WifiPasspointSoapClient.java b/service/java/com/android/server/wifi/passpoint/WifiPasspointSoapClient.java
index eebe916..6f0bdaa 100644
--- a/service/java/com/android/server/wifi/passpoint/WifiPasspointSoapClient.java
+++ b/service/java/com/android/server/wifi/passpoint/WifiPasspointSoapClient.java
@@ -21,7 +21,6 @@
import android.net.wifi.passpoint.WifiPasspointCredential;
import android.net.wifi.passpoint.WifiPasspointDmTree;
import android.net.wifi.passpoint.WifiPasspointManager;
-import android.net.wifi.passpoint.WifiPasspointManager.ParcelableString;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.net.Uri;
@@ -52,6 +51,7 @@
import com.android.org.bouncycastle.jce.provider.BouncyCastleProvider;
import com.android.org.bouncycastle.jce.exception.ExtCertPathValidatorException;
+import com.android.internal.util.ParcelableString;
import com.android.internal.util.StateMachine;
import com.android.server.wifi.passpoint.WifiPasspointClient.AuthenticationElement;
import com.android.org.conscrypt.TrustManagerImpl;
@@ -2076,7 +2076,7 @@
if (uri == null) {
return false;
}
- ParcelableString launchBrowserUri = new WifiPasspointManager.ParcelableString();
+ ParcelableString launchBrowserUri = new ParcelableString();
launchBrowserUri.string = uri;
mTarget.sendMessage(WifiPasspointStateMachine.CMD_LAUNCH_BROWSER, launchBrowserUri);
diff --git a/service/java/com/android/server/wifi/passpoint/WifiPasspointStateMachine.java b/service/java/com/android/server/wifi/passpoint/WifiPasspointStateMachine.java
index 40f0b28..a012780 100644
--- a/service/java/com/android/server/wifi/passpoint/WifiPasspointStateMachine.java
+++ b/service/java/com/android/server/wifi/passpoint/WifiPasspointStateMachine.java
@@ -32,7 +32,6 @@
import android.net.wifi.passpoint.WifiPasspointPolicy;
import android.net.wifi.passpoint.WifiPasspointOsuProvider;
import android.net.wifi.passpoint.WifiPasspointManager;
-import android.net.wifi.passpoint.WifiPasspointManager.ParcelableString;
import android.net.wifi.passpoint.WifiPasspointDmTree;
import android.os.Handler;
import android.os.IBinder;
@@ -47,6 +46,7 @@
import android.net.wifi.IWifiManager;
import com.android.internal.util.AsyncChannel;
+import com.android.internal.util.ParcelableString;
import com.android.internal.util.Protocol;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
