Merge "Remove hidden connectivity methods access" (3e737c11) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/Utils.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ import android.hardware.fingerprint.FingerprintManager;
		import android.media.MediaRoute2Info;
		import android.media.MediaRouter2Manager;
		import android.net.ConnectivityManager;
		import android.net.LinkAddress;
		import android.net.LinkProperties;
		import android.net.Network;
		import android.net.wifi.WifiManager;
		@@ -116,7 +117,6 @@ import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
		import com.android.settings.password.ChooseLockSettingsHelper;
		import com.android.settingslib.widget.ActionBarShadowController;

		import java.net.InetAddress;
		import java.util.Iterator;
		import java.util.List;
		import java.util.Locale;
		@@ -237,13 +237,13 @@ public final class Utils extends com.android.settingslib.Utils {

		private static String formatIpAddresses(LinkProperties prop) {
		if (prop == null) return null;
		final Iterator<InetAddress> iter = prop.getAllAddresses().iterator();
		final Iterator<LinkAddress> iter = prop.getAllLinkAddresses().iterator();
		// If there are no entries, return null
		if (!iter.hasNext()) return null;
		// Concatenate all available addresses, comma separated
		String addresses = "";
		while (iter.hasNext()) {
		addresses += iter.next().getHostAddress();
		addresses += iter.next().getAddress().getHostAddress();
		if (iter.hasNext()) addresses += "\n";
		}
		return addresses;

src/com/android/settings/development/AdbIpAddressPreferenceController.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.settings.development;
		import android.content.Context;
		import android.debug.IAdbManager;
		import android.net.ConnectivityManager;
		import android.net.LinkAddress;
		import android.net.LinkProperties;
		import android.net.wifi.WifiManager;
		import android.os.RemoteException;
		@@ -135,7 +136,7 @@ public class AdbIpAddressPreferenceController extends AbstractConnectivityPrefer
		return null;
		}

		Iterator<InetAddress> iter = prop.getAllAddresses().iterator();
		Iterator<LinkAddress> iter = prop.getAllLinkAddresses().iterator();
		// If there are no entries, return null
		if (!iter.hasNext()) {
		return null;
		@@ -144,7 +145,7 @@ public class AdbIpAddressPreferenceController extends AbstractConnectivityPrefer
		// Concatenate all available addresses, newline separated
		StringBuilder addresses = new StringBuilder();
		while (iter.hasNext()) {
		InetAddress addr = iter.next();
		InetAddress addr = iter.next().getAddress();
		if (addr instanceof Inet4Address) {
		// adb only supports ipv4 at the moment
		addresses.append(addr.getHostAddress());

src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -40,11 +40,13 @@ public class AirplaneModeConditionController implements ConditionalCardControlle
		private final ConditionManager mConditionManager;
		private final Context mAppContext;
		private final Receiver mReceiver;
		private final ConnectivityManager mConnectivityManager;

		public AirplaneModeConditionController(Context appContext, ConditionManager conditionManager) {
		mAppContext = appContext;
		mConditionManager = conditionManager;
		mReceiver = new Receiver();
		mConnectivityManager = mAppContext.getSystemService(ConnectivityManager.class);
		}

		@Override
		@@ -65,7 +67,7 @@ public class AirplaneModeConditionController implements ConditionalCardControlle

		@Override
		public void onActionClick() {
		ConnectivityManager.from(mAppContext).setAirplaneMode(false);
		mConnectivityManager.setAirplaneMode(false);
		}

		@Override

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

+13 −10

Original line number	Diff line number	Diff line
		@@ -825,9 +825,12 @@ public class WifiConfigController implements TextWatcher,
		.get(mEapSimSpinner.getSelectedItemPosition()).getCarrierId();
		}

		config.setIpConfiguration(
		new IpConfiguration(mIpAssignment, mProxySettings,
		mStaticIpConfiguration, mHttpProxy));
		final IpConfiguration ipConfig = new IpConfiguration();
		ipConfig.setIpAssignment(mIpAssignment);
		ipConfig.setProxySettings(mProxySettings);
		ipConfig.setStaticIpConfiguration(mStaticIpConfiguration);
		ipConfig.setHttpProxy(mHttpProxy);
		config.setIpConfiguration(ipConfig);
		if (mMeteredSettingsSpinner != null) {
		config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition();
		}
		@@ -1400,18 +1403,18 @@ public class WifiConfigController implements TextWatcher,
		StaticIpConfiguration staticConfig = config.getIpConfiguration()
		.getStaticIpConfiguration();
		if (staticConfig != null) {
		if (staticConfig.ipAddress != null) {
		if (staticConfig.getIpAddress() != null) {
		mIpAddressView.setText(
		staticConfig.ipAddress.getAddress().getHostAddress());
		mNetworkPrefixLengthView.setText(Integer.toString(staticConfig.ipAddress
		.getPrefixLength()));
		staticConfig.getIpAddress().getAddress().getHostAddress());
		mNetworkPrefixLengthView.setText(Integer.toString(
		staticConfig.getIpAddress().getPrefixLength()));
		}

		if (staticConfig.gateway != null) {
		mGatewayView.setText(staticConfig.gateway.getHostAddress());
		if (staticConfig.getGateway() != null) {
		mGatewayView.setText(staticConfig.getGateway().getHostAddress());
		}

		Iterator<InetAddress> dnsIterator = staticConfig.dnsServers.iterator();
		Iterator<InetAddress> dnsIterator = staticConfig.getDnsServers().iterator();
		if (dnsIterator.hasNext()) {
		mDns1View.setText(dnsIterator.next().getHostAddress());
		}

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

+9 −6

Original line number	Diff line number	Diff line
		@@ -807,9 +807,12 @@ public class WifiConfigController2 implements TextWatcher,
		return null;
		}

		config.setIpConfiguration(
		new IpConfiguration(mIpAssignment, mProxySettings,
		mStaticIpConfiguration, mHttpProxy));
		final IpConfiguration ipConfig = new IpConfiguration();
		ipConfig.setIpAssignment(mIpAssignment);
		ipConfig.setProxySettings(mProxySettings);
		ipConfig.setStaticIpConfiguration(mStaticIpConfiguration);
		ipConfig.setHttpProxy(mHttpProxy);
		config.setIpConfiguration(ipConfig);
		if (mMeteredSettingsSpinner != null) {
		config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition();
		}
		@@ -958,7 +961,7 @@ public class WifiConfigController2 implements TextWatcher,
		return R.string.wifi_ip_settings_invalid_dns;
		}
		dnsServers.add(dnsAddr);
		staticIpConfiguration.dnsServers.add(dnsAddr);
		staticIpConfiguration.getDnsServers().add(dnsAddr);
		}

		if (mDns2View.length() > 0) {
		@@ -968,7 +971,7 @@ public class WifiConfigController2 implements TextWatcher,
		return R.string.wifi_ip_settings_invalid_dns;
		}
		dnsServers.add(dnsAddr);
		staticIpConfiguration.dnsServers.add(dnsAddr);
		staticIpConfiguration.getDnsServers().add(dnsAddr);
		}
		staticIPBuilder.setDnsServers(dnsServers);
		return 0;
		@@ -1393,7 +1396,7 @@ public class WifiConfigController2 implements TextWatcher,
		staticConfig.getIpAddress().getPrefixLength()));
		}

		if (staticConfig.gateway != null) {
		if (staticConfig.getGateway() != null) {
		mGatewayView.setText(staticConfig.getGateway().getHostAddress());
		}