merge from open-source master (7d10df4e) · Commits · e / os / android_frameworks_base

core/jni/android_net_NetUtils.cpp

+2 −23

Original line number	Diff line number	Diff line
		@@ -22,29 +22,8 @@
		#include <utils/Log.h>
		#include <arpa/inet.h>

		extern "C" {
		int ifc_enable(const char *ifname);
		int ifc_disable(const char *ifname);
		int ifc_add_host_route(const char *ifname, uint32_t addr);
		int ifc_remove_host_routes(const char *ifname);
		int ifc_set_default_route(const char *ifname, uint32_t gateway);
		int ifc_get_default_route(const char *ifname);
		int ifc_remove_default_route(const char *ifname);
		int ifc_reset_connections(const char *ifname);
		int ifc_configure(const char *ifname, in_addr_t ipaddr, in_addr_t netmask, in_addr_t gateway, in_addr_t dns1, in_addr_t dns2);

		int dhcp_do_request(const char *ifname,
		in_addr_t *ipaddr,
		in_addr_t *gateway,
		in_addr_t *mask,
		in_addr_t *dns1,
		in_addr_t *dns2,
		in_addr_t *server,
		uint32_t *lease);
		int dhcp_stop(const char *ifname);
		int dhcp_release_lease(const char *ifname);
		char *dhcp_get_errmsg();
		}
		#include <netutils/ifc.h>
		#include <netutils/dhcp.h>

		#define NETUTILS_PKG_NAME "android/net/NetworkUtils"

core/jni/android_net_wifi_Wifi.cpp

+0 −54

Original line number	Diff line number	Diff line
		@@ -30,23 +30,6 @@ namespace android {

		static jboolean sScanModeActive = false;

		/*
		* The following remembers the jfieldID's of the fields
		* of the DhcpInfo Java object, so that we don't have
		* to look them up every time.
		*/
		static struct fieldIds {
		jclass dhcpInfoClass;
		jmethodID constructorId;
		jfieldID ipaddress;
		jfieldID gateway;
		jfieldID netmask;
		jfieldID dns1;
		jfieldID dns2;
		jfieldID serverAddress;
		jfieldID leaseDuration;
		} dhcpInfoFieldIds;

		static int doCommand(const char cmd, char replybuf, int replybuflen)
		{
		size_t reply_len = replybuflen - 1;
		@@ -493,28 +476,6 @@ static jboolean android_net_wifi_clearBlacklistCommand(JNIEnv* env, jobject claz
		return doBooleanCommand("BLACKLIST clear", "OK");
		}

		static jboolean android_net_wifi_doDhcpRequest(JNIEnv* env, jobject clazz, jobject info)
		{
		jint ipaddr, gateway, mask, dns1, dns2, server, lease;
		jboolean succeeded = ((jboolean)::do_dhcp_request(&ipaddr, &gateway, &mask,
		&dns1, &dns2, &server, &lease) == 0);
		if (succeeded && dhcpInfoFieldIds.dhcpInfoClass != NULL) {
		env->SetIntField(info, dhcpInfoFieldIds.ipaddress, ipaddr);
		env->SetIntField(info, dhcpInfoFieldIds.gateway, gateway);
		env->SetIntField(info, dhcpInfoFieldIds.netmask, mask);
		env->SetIntField(info, dhcpInfoFieldIds.dns1, dns1);
		env->SetIntField(info, dhcpInfoFieldIds.dns2, dns2);
		env->SetIntField(info, dhcpInfoFieldIds.serverAddress, server);
		env->SetIntField(info, dhcpInfoFieldIds.leaseDuration, lease);
		}
		return succeeded;
		}

		static jstring android_net_wifi_getDhcpError(JNIEnv* env, jobject clazz)
		{
		return env->NewStringUTF(::get_dhcp_error_string());
		}

		// ----------------------------------------------------------------------------

		/*
		@@ -571,9 +532,6 @@ static JNINativeMethod gWifiMethods[] = {
		{ "setScanResultHandlingCommand", "(I)Z", (void*) android_net_wifi_setScanResultHandlingCommand },
		{ "addToBlacklistCommand", "(Ljava/lang/String;)Z", (void*) android_net_wifi_addToBlacklistCommand },
		{ "clearBlacklistCommand", "()Z", (void*) android_net_wifi_clearBlacklistCommand },

		{ "doDhcpRequest", "(Landroid/net/DhcpInfo;)Z", (void*) android_net_wifi_doDhcpRequest },
		{ "getDhcpError", "()Ljava/lang/String;", (void*) android_net_wifi_getDhcpError },
		};

		int register_android_net_wifi_WifiManager(JNIEnv* env)
		@@ -581,18 +539,6 @@ int register_android_net_wifi_WifiManager(JNIEnv* env)
		jclass wifi = env->FindClass(WIFI_PKG_NAME);
		LOG_FATAL_IF(wifi == NULL, "Unable to find class " WIFI_PKG_NAME);

		dhcpInfoFieldIds.dhcpInfoClass = env->FindClass("android/net/DhcpInfo");
		if (dhcpInfoFieldIds.dhcpInfoClass != NULL) {
		dhcpInfoFieldIds.constructorId = env->GetMethodID(dhcpInfoFieldIds.dhcpInfoClass, "<init>", "()V");
		dhcpInfoFieldIds.ipaddress = env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "ipAddress", "I");
		dhcpInfoFieldIds.gateway = env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "gateway", "I");
		dhcpInfoFieldIds.netmask = env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "netmask", "I");
		dhcpInfoFieldIds.dns1 = env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "dns1", "I");
		dhcpInfoFieldIds.dns2 = env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "dns2", "I");
		dhcpInfoFieldIds.serverAddress = env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "serverAddress", "I");
		dhcpInfoFieldIds.leaseDuration = env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "leaseDuration", "I");
		}

		return AndroidRuntime::registerNativeMethods(env,
		WIFI_PKG_NAME, gWifiMethods, NELEM(gWifiMethods));
		}

wifi/java/android/net/wifi/WifiNative.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package android.net.wifi;

		import android.net.DhcpInfo;

		/**
		* Native calls for sending requests to the supplicant daemon, and for
		* receiving asynchronous events. All methods of the form "xxxxCommand()"
		@@ -145,10 +143,6 @@ public class WifiNative {

		public native static boolean clearBlacklistCommand();

		public native static boolean doDhcpRequest(DhcpInfo results);

		public native static String getDhcpError();

		/**
		* Wait for the supplicant to send an event, returning the event string.
		* @return the event string sent by the supplicant.

wifi/java/android/net/wifi/WifiStateTracker.java

+4 −12

Original line number	Diff line number	Diff line
		@@ -314,6 +314,7 @@ public class WifiStateTracker extends NetworkStateTracker {
		private static String LS = System.getProperty("line.separator");

		private static String[] sDnsPropNames;
		private Runnable mReleaseWakeLockCallback;

		/**
		* A structure for supplying information about a supplicant state
		@@ -371,9 +372,9 @@ public class WifiStateTracker extends NetworkStateTracker {
		mSettingsObserver = new SettingsObserver(new Handler());

		mInterfaceName = SystemProperties.get("wifi.interface", "tiwlan0");
		sDnsPropNames = new String[] {
		"dhcp." + mInterfaceName + ".dns1",
		"dhcp." + mInterfaceName + ".dns2"
		mDnsPropNames = new String[] {
		"net." + mInterfaceName + ".dns1",
		"net." + mInterfaceName + ".dns2"
		};
		mBatteryStats = IBatteryStats.Stub.asInterface(ServiceManager.getService("batteryinfo"));

		@@ -417,15 +418,6 @@ public class WifiStateTracker extends NetworkStateTracker {
		updateNetworkInfo();
		}

		/**
		* Return the IP addresses of the DNS servers available for the WLAN
		* network interface.
		* @return a list of DNS addresses, with no holes.
		*/
		public String[] getNameServers() {
		return getNameServerList(sDnsPropNames);
		}

		/**
		* Return the name of our WLAN network interface.
		* @return the name of our interface.