Merge changes from topic 'bad_wifi_checkbox' into nyc-dr1-dev (59266eec) · Commits · e / os / android_frameworks_base

core/java/android/net/ConnectivityManager.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -3197,6 +3197,27 @@ public class ConnectivityManager {
		}
		}

		/**
		* Informs the system to penalize {@code network}'s score when it becomes unvalidated. This is
		* only meaningful if the system is configured not to penalize such networks, e.g., if the
		* {@code config_networkAvoidBadWifi} configuration variable is set to 0 and the {@code
		* NETWORK_AVOID_BAD_WIFI setting is unset}.
		*
		* <p>This method requires the caller to hold the permission
		* {@link android.Manifest.permission#CONNECTIVITY_INTERNAL}
		*
		* @param network The network to accept.
		*
		* @hide
		*/
		public void setAvoidUnvalidated(Network network) {
		try {
		mService.setAvoidUnvalidated(network);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Resets all connectivity manager settings back to factory defaults.
		* @hide

core/java/android/net/IConnectivityManager.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -161,6 +161,7 @@ interface IConnectivityManager
		void releaseNetworkRequest(in NetworkRequest networkRequest);

		void setAcceptUnvalidated(in Network network, boolean accept, boolean always);
		void setAvoidUnvalidated(in Network network);

		int getRestoreDefaultNetworkDelay(int networkType);

core/java/android/provider/Settings.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -7443,6 +7443,13 @@ public final class Settings {

		/**
		* Whether to automatically switch away from wifi networks that lose Internet access.
		* Only meaningful if config_networkAvoidBadWifi is set to 0, otherwise the system always
		* avoids such networks. Valid values are:
		*
		* 0: Don't avoid bad wifi, don't prompt the user. Get stuck on bad wifi like it's 2013.
		* null: Ask the user whether to switch away from bad wifi.
		* 1: Avoid bad wifi.
		*
		* @hide
		*/
		public static final String NETWORK_AVOID_BAD_WIFI = "network_avoid_bad_wifi";

services/core/java/com/android/server/ConnectivityService.java

+85 −15

Original line number	Diff line number	Diff line
		@@ -365,6 +365,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
		*/
		private static final int EVENT_SET_ACCEPT_UNVALIDATED = 28;

		/**
		* used to specify whether a network should not be penalized when it becomes unvalidated.
		*/
		private static final int EVENT_SET_AVOID_UNVALIDATED = 35;

		/**
		* used to ask the user to confirm a connection to an unvalidated network.
		* obj = network
		@@ -2060,7 +2065,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
		mKeepaliveTracker.dump(pw);

		pw.println();
		dumpAvoidBadWifiSettings(pw);

		pw.println();
		if (mInetLog != null && mInetLog.size() > 0) {
		pw.println();
		pw.println("Inet condition reports:");
		@@ -2681,6 +2688,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
		accept ? 1 : 0, always ? 1: 0, network));
		}

		@Override
		public void setAvoidUnvalidated(Network network) {
		enforceConnectivityInternalPermission();
		mHandler.sendMessage(mHandler.obtainMessage(EVENT_SET_AVOID_UNVALIDATED, network));
		}

		private void handleSetAcceptUnvalidated(Network network, boolean accept, boolean always) {
		if (DBG) log("handleSetAcceptUnvalidated network=" + network +
		" accept=" + accept + " always=" + always);
		@@ -2721,6 +2734,20 @@ public class ConnectivityService extends IConnectivityManager.Stub

		}

		private void handleSetAvoidUnvalidated(Network network) {
		NetworkAgentInfo nai = getNetworkAgentInfoForNetwork(network);
		if (nai == null \|\| nai.lastValidated) {
		// Nothing to do. The network either disconnected or revalidated.
		return;
		}
		if (!nai.avoidUnvalidated) {
		int oldScore = nai.getCurrentScore();
		nai.avoidUnvalidated = true;
		rematchAllNetworksAndRequests(nai, oldScore);
		sendUpdatedScoreToFactories(nai);
		}
		}

		private void scheduleUnvalidatedPrompt(NetworkAgentInfo nai) {
		if (VDBG) log("scheduleUnvalidatedPrompt " + nai.network);
		mHandler.sendMessageDelayed(
		@@ -2728,31 +2755,70 @@ public class ConnectivityService extends IConnectivityManager.Stub
		PROMPT_UNVALIDATED_DELAY_MS);
		}

		private boolean mAvoidBadWifi;
		private boolean mAvoidBadWifi = true;

		public boolean avoidBadWifi() {
		return mAvoidBadWifi;
		}

		@VisibleForTesting
		public boolean updateAvoidBadWifi() {
		// There are two modes: either we always automatically avoid unvalidated wifi, or we show a
		// dialog and don't switch to it. The behaviour is controlled by the NETWORK_AVOID_BAD_WIFI
		// setting. If the setting has no value, then the value is taken from the config value,
		// which can be changed via OEM/carrier overlays.
		//
		// The only valid values for NETWORK_AVOID_BAD_WIFI are null and unset. Currently, the unit
		// test uses 0 in order to avoid having to mock out fetching the carrier setting.
		int defaultAvoidBadWifi =
		mContext.getResources().getInteger(R.integer.config_networkAvoidBadWifi);
		int avoid = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.NETWORK_AVOID_BAD_WIFI, defaultAvoidBadWifi);
		/** Whether the device or carrier configuration disables avoiding bad wifi by default. */
		public boolean configRestrictsAvoidBadWifi() {
		return mContext.getResources().getInteger(R.integer.config_networkAvoidBadWifi) == 0;
		}

		/** Whether we should display a notification when wifi becomes unvalidated. */
		public boolean shouldNotifyWifiUnvalidated() {
		return configRestrictsAvoidBadWifi() &&
		Settings.Global.getString(mContext.getContentResolver(),
		Settings.Global.NETWORK_AVOID_BAD_WIFI) == null;
		}

		private boolean updateAvoidBadWifi() {
		boolean settingAvoidBadWifi = "1".equals(Settings.Global.getString(
		mContext.getContentResolver(), Settings.Global.NETWORK_AVOID_BAD_WIFI));

		boolean prev = mAvoidBadWifi;
		mAvoidBadWifi = (avoid == 1);
		mAvoidBadWifi = settingAvoidBadWifi \|\| !configRestrictsAvoidBadWifi();
		return mAvoidBadWifi != prev;
		}

		private void dumpAvoidBadWifiSettings(IndentingPrintWriter pw) {
		boolean configRestrict = configRestrictsAvoidBadWifi();
		if (!configRestrict) {
		pw.println("Bad Wi-Fi avoidance: unrestricted");
		return;
		}

		pw.println("Bad Wi-Fi avoidance: " + avoidBadWifi());
		pw.increaseIndent();
		pw.println("Config restrict: " + configRestrict);

		String value = Settings.Global.getString(
		mContext.getContentResolver(), Settings.Global.NETWORK_AVOID_BAD_WIFI);
		String description;
		// Can't use a switch statement because strings are legal case labels, but null is not.
		if ("0".equals(value)) {
		description = "get stuck";
		} else if (value == null) {
		description = "prompt";
		} else if ("1".equals(value)) {
		description = "avoid";
		} else {
		description = value + " (?)";
		}
		pw.println("User setting: " + description);
		pw.println("Network overrides:");
		pw.increaseIndent();
		for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {
		if (nai.avoidUnvalidated) {
		pw.println(nai.name());
		}
		}
		pw.decreaseIndent();
		pw.decreaseIndent();
		}

		private void showValidationNotification(NetworkAgentInfo nai, NotificationType type) {
		final String action;
		switch (type) {
		@@ -2802,7 +2868,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		NetworkCapabilities nc = nai.networkCapabilities;
		if (DBG) log("handleNetworkUnvalidated " + nai.name() + " cap=" + nc);

		if (nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) && !avoidBadWifi()) {
		if (nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) && shouldNotifyWifiUnvalidated()) {
		showValidationNotification(nai, NotificationType.LOST_INTERNET);
		}
		}
		@@ -2880,6 +2946,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
		handleSetAcceptUnvalidated((Network) msg.obj, msg.arg1 != 0, msg.arg2 != 0);
		break;
		}
		case EVENT_SET_AVOID_UNVALIDATED: {
		handleSetAvoidUnvalidated((Network) msg.obj);
		break;
		}
		case EVENT_PROMPT_UNVALIDATED: {
		handlePromptUnvalidated((Network) msg.obj);
		break;

services/core/java/com/android/server/connectivity/NetworkAgentInfo.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -138,12 +138,14 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> {
		public boolean everValidated;

		// The result of the last validation attempt on this network (true if validated, false if not).
		// This bit exists only because we never unvalidate a network once it's been validated, and that
		// is because the network scoring and revalidation code does not (may not?) deal properly with
		// networks becoming unvalidated.
		// TODO: Fix the network scoring code, remove this, and rename everValidated to validated.
		public boolean lastValidated;

		// If true, becoming unvalidated will lower the network's score. This is only meaningful if the
		// system is configured not to do this for certain networks, e.g., if the
		// config_networkAvoidBadWifi option is set to 0 and the user has not overridden that via
		// Settings.Global.NETWORK_AVOID_BAD_WIFI.
		public boolean avoidUnvalidated;

		// Whether a captive portal was ever detected on this network.
		// This is a sticky bit; once set it is never cleared.
		public boolean everCaptivePortalDetected;
		@@ -365,8 +367,10 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> {
		// Return true on devices configured to ignore score penalty for wifi networks
		// that become unvalidated (b/31075769).
		private boolean ignoreWifiUnvalidationPenalty() {
		boolean isWifi = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI);
		return isWifi && !mConnService.avoidBadWifi() && everValidated;
		boolean isWifi = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) &&
		networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
		boolean avoidBadWifi = mConnService.avoidBadWifi() \|\| avoidUnvalidated;
		return isWifi && !avoidBadWifi && everValidated;
		}

		// Get the current score for this Network. This may be modified from what the