Merge "Introduce a WifiTrackerLibProvider." (7f05bd4d) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/overlay/FeatureFactory.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import com.android.settings.search.SearchFeatureProvider;
		import com.android.settings.security.SecurityFeatureProvider;
		import com.android.settings.slices.SlicesFeatureProvider;
		import com.android.settings.users.UserFeatureProvider;
		import com.android.settings.wifi.WifiTrackerLibProvider;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

		/**
		@@ -143,6 +144,11 @@ public abstract class FeatureFactory {

		public abstract FaceFeatureProvider getFaceFeatureProvider();

		/**
		* Gets implementation for the WifiTrackerLib.
		*/
		public abstract WifiTrackerLibProvider getWifiTrackerLibProvider();

		public static final class FactoryNotFoundException extends RuntimeException {
		public FactoryNotFoundException(Throwable throwable) {
		super("Unable to create factory. Did you misconfigure Proguard?", throwable);

src/com/android/settings/overlay/FeatureFactoryImpl.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,8 @@ import com.android.settings.slices.SlicesFeatureProvider;
		import com.android.settings.slices.SlicesFeatureProviderImpl;
		import com.android.settings.users.UserFeatureProvider;
		import com.android.settings.users.UserFeatureProviderImpl;
		import com.android.settings.wifi.WifiTrackerLibProvider;
		import com.android.settings.wifi.WifiTrackerLibProviderImpl;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

		/**
		@@ -90,6 +92,7 @@ public class FeatureFactoryImpl extends FeatureFactory {
		private BluetoothFeatureProvider mBluetoothFeatureProvider;
		private AwareFeatureProvider mAwareFeatureProvider;
		private FaceFeatureProvider mFaceFeatureProvider;
		private WifiTrackerLibProvider mWifiTrackerLibProvider;

		@Override
		public SupportFeatureProvider getSupportFeatureProvider(Context context) {
		@@ -278,4 +281,12 @@ public class FeatureFactoryImpl extends FeatureFactory {
		}
		return mFaceFeatureProvider;
		}

		@Override
		public WifiTrackerLibProvider getWifiTrackerLibProvider() {
		if (mWifiTrackerLibProvider == null) {
		mWifiTrackerLibProvider = new WifiTrackerLibProviderImpl();
		}
		return mWifiTrackerLibProvider;
		}
		}

src/com/android/settings/wifi/ConfigureWifiEntryFragment.java

+13 −15

Original line number	Diff line number	Diff line
		@@ -21,9 +21,6 @@ import android.app.Activity;
		import android.app.settings.SettingsEnums;
		import android.content.Context;
		import android.content.Intent;
		import android.net.ConnectivityManager;
		import android.net.NetworkScoreManager;
		import android.net.wifi.WifiManager;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.HandlerThread;
		@@ -40,6 +37,7 @@ import androidx.annotation.VisibleForTesting;

		import com.android.settings.R;
		import com.android.settings.core.InstrumentedFragment;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
		import com.android.wifitrackerlib.NetworkDetailsTracker;
		import com.android.wifitrackerlib.WifiEntry;
		@@ -222,17 +220,17 @@ public class ConfigureWifiEntryFragment extends InstrumentedFragment implements
		}
		};

		mNetworkDetailsTracker = NetworkDetailsTracker.createNetworkDetailsTracker(
		mNetworkDetailsTracker = FeatureFactory.getFactory(context)
		.getWifiTrackerLibProvider()
		.createNetworkDetailsTracker(
		getSettingsLifecycle(),
		context,
		context.getSystemService(WifiManager.class),
		context.getSystemService(ConnectivityManager.class),
		context.getSystemService(NetworkScoreManager.class),
		new Handler(Looper.getMainLooper()),
		mWorkerThread.getThreadHandler(),
		elapsedRealtimeClock,
		MAX_SCAN_AGE_MILLIS,
		SCAN_INTERVAL_MILLIS,
		getArguments().getString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY));
		getArguments().getString(
		WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY));
		}
		}

src/com/android/settings/wifi/NetworkRequestDialogFragment.java

+10 −13

Original line number	Diff line number	Diff line
		@@ -24,11 +24,8 @@ import android.app.Dialog;
		import android.content.Context;
		import android.content.DialogInterface;
		import android.graphics.drawable.Drawable;
		import android.net.ConnectivityManager;
		import android.net.NetworkScoreManager;
		import android.net.wifi.ScanResult;
		import android.net.wifi.WifiConfiguration;
		import android.net.wifi.WifiManager;
		import android.net.wifi.WifiManager.NetworkRequestMatchCallback;
		import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
		import android.os.Bundle;
		@@ -54,6 +51,7 @@ import androidx.appcompat.app.AlertDialog;
		import androidx.preference.internal.PreferenceImageView;

		import com.android.settings.R;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settingslib.Utils;
		import com.android.wifitrackerlib.WifiEntry;
		import com.android.wifitrackerlib.WifiPickerTracker;
		@@ -113,10 +111,9 @@ public class NetworkRequestDialogFragment extends NetworkRequestDialogBaseFragme
		}
		};
		final Context context = getContext();
		mWifiPickerTracker = new WifiPickerTracker(getSettingsLifecycle(), context,
		context.getSystemService(WifiManager.class),
		context.getSystemService(ConnectivityManager.class),
		context.getSystemService(NetworkScoreManager.class),
		mWifiPickerTracker = FeatureFactory.getFactory(context)
		.getWifiTrackerLibProvider()
		.createWifiPickerTracker(getSettingsLifecycle(), context,
		new Handler(Looper.getMainLooper()),
		mWorkerThread.getThreadHandler(),
		elapsedRealtimeClock,

src/com/android/settings/wifi/WifiConnectionPreferenceController.java

+10 −13

Original line number	Diff line number	Diff line
		@@ -17,9 +17,6 @@
		package com.android.settings.wifi;

		import android.content.Context;
		import android.net.ConnectivityManager;
		import android.net.NetworkScoreManager;
		import android.net.wifi.WifiManager;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.HandlerThread;
		@@ -36,6 +33,7 @@ import androidx.preference.PreferenceScreen;

		import com.android.settings.R;
		import com.android.settings.core.SubSettingLauncher;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		@@ -115,10 +113,9 @@ public class WifiConnectionPreferenceController extends AbstractPreferenceContro
		return SystemClock.elapsedRealtime();
		}
		};
		mWifiPickerTracker = new WifiPickerTracker(lifecycle, context,
		context.getSystemService(WifiManager.class),
		context.getSystemService(ConnectivityManager.class),
		context.getSystemService(NetworkScoreManager.class),
		mWifiPickerTracker = FeatureFactory.getFactory(context)
		.getWifiTrackerLibProvider()
		.createWifiPickerTracker(lifecycle, context,
		new Handler(Looper.getMainLooper()),
		mWorkerThread.getThreadHandler(),
		elapsedRealtimeClock,