From 67045c76c2272093a053be4efb31a6c4c7d0675c Mon Sep 17 00:00:00 2001 From: Ecco Park Date: Fri, 10 Aug 2018 15:54:43 -0700 Subject: RedirectListener: move out of PasspointProvisioner Constructor Bug: 74244324 Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh Change-Id: Ie65d2c87a3c79ac093f6c209e02f8de8eb59a982 Signed-off-by: Ecco Park --- .../java/com/android/server/wifi/hotspot2/PasspointProvisioner.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'service') diff --git a/service/java/com/android/server/wifi/hotspot2/PasspointProvisioner.java b/service/java/com/android/server/wifi/hotspot2/PasspointProvisioner.java index 80dc79952..d4ea894be 100644 --- a/service/java/com/android/server/wifi/hotspot2/PasspointProvisioner.java +++ b/service/java/com/android/server/wifi/hotspot2/PasspointProvisioner.java @@ -60,7 +60,7 @@ public class PasspointProvisioner { private final WfaKeyStore mWfaKeyStore; private final PasspointObjectFactory mObjectFactory; private final SystemInfo mSystemInfo; - private final RedirectListener mRedirectListener; + private RedirectListener mRedirectListener; private int mCurrentSessionId = 0; private int mCallingUid; private boolean mVerboseLoggingEnabled = false; @@ -74,7 +74,6 @@ public class PasspointProvisioner { mOsuServerConnection = objectFactory.makeOsuServerConnection(); mWfaKeyStore = objectFactory.makeWfaKeyStore(); mSystemInfo = objectFactory.getSystemInfo(context, wifiNative); - mRedirectListener = RedirectListener.createInstance(); mObjectFactory = objectFactory; } @@ -87,6 +86,7 @@ public class PasspointProvisioner { mOsuNetworkConnection.init(mProvisioningStateMachine.getHandler()); // Offload the heavy load job to another thread mProvisioningStateMachine.getHandler().post(() -> { + mRedirectListener = RedirectListener.createInstance(); mWfaKeyStore.load(); mOsuServerConnection.init(mObjectFactory.getSSLContext(TLS_VERSION), mObjectFactory.getTrustManagerImpl(mWfaKeyStore.get())); -- cgit v1.2.3