resolved conflicts for merge of 6c9a3004 to master (a6fa26f8) · Commits · e / os / android_frameworks_base

core/java/android/app/SearchDialog.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1131,7 +1131,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
		try {
		// If the intent was created from a suggestion, it will always have an explicit
		// component here.
		Log.i(LOG_TAG, "Starting (as ourselves) " + intent.toURI());
		Log.i(LOG_TAG, "Starting (as ourselves) " + intent.toUri(0));
		getContext().startActivity(intent);
		// If the search switches to a different activity,
		// SearchDialogWrapper#performActivityResuming

core/java/android/provider/Settings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3588,7 +3588,7 @@ public final class Settings {
		ContentValues values = new ContentValues();
		if (title != null) values.put(TITLE, title);
		if (folder != null) values.put(FOLDER, folder);
		values.put(INTENT, intent.toURI());
		values.put(INTENT, intent.toUri(0));
		if (shortcut != 0) values.put(SHORTCUT, (int) shortcut);
		values.put(ORDERING, ordering);
		return cr.insert(CONTENT_URI, values);

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));
		}

opengl/libagl/egl.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -485,13 +485,13 @@ void egl_window_surface_v2_t::copyBlt(
		copybit_device_t* const copybit = blitengine;
		if (copybit) {
		copybit_image_t simg;
		simg.w = src->width;
		simg.w = src->stride;
		simg.h = src->height;
		simg.format = src->format;
		simg.handle = const_cast<native_handle_t*>(src->handle);

		copybit_image_t dimg;
		dimg.w = dst->width;
		dimg.w = dst->stride;
		dimg.h = dst->height;
		dimg.format = dst->format;
		dimg.handle = const_cast<native_handle_t*>(dst->handle);