Merge "Delete dead code." am: cf59ff79c5 am: d305a7c894 am: 8cf7169564 (e00c7dd3) · Commits · e / os / android_frameworks_base

core/java/android/os/INetworkManagementService.aidl

+0 −5

Original line number	Diff line number	Diff line
		@@ -312,11 +312,6 @@ interface INetworkManagementService
		*/
		void setDnsConfigurationForNetwork(int netId, in String[] servers, String domains);

		/**
		* Bind name servers to a network in the DNS resolver.
		*/
		void setDnsServersForNetwork(int netId, in String[] servers, String domains);

		void setFirewallEnabled(boolean enabled);
		boolean isFirewallEnabled();
		void setFirewallInterfaceRule(String iface, boolean allow);

+0 −25

Original line number	Diff line number	Diff line
		@@ -1911,31 +1911,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub
		}
		}

		@Override
		public void setDnsServersForNetwork(int netId, String[] servers, String domains) {
		mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

		Command cmd;
		if (servers.length > 0) {
		cmd = new Command("resolver", "setnetdns", netId,
		(domains == null ? "" : domains));
		for (String s : servers) {
		InetAddress a = NetworkUtils.numericToInetAddress(s);
		if (a.isAnyLocalAddress() == false) {
		cmd.appendArg(a.getHostAddress());
		}
		}
		} else {
		cmd = new Command("resolver", "clearnetdns", netId);
		}

		try {
		mConnector.execute(cmd);
		} catch (NativeDaemonConnectorException e) {
		throw e.rethrowAsParcelableException();
		}
		}

		@Override
		public void addVpnUidRanges(int netId, UidRange[] ranges) {
		mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);