Merge "Updated: Wi-Fi p2p framework" (da6e4a7d) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -195,6 +195,7 @@ LOCAL_SRC_FILES += \
		telephony/java/com/android/internal/telephony/ISms.aidl \
		telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
		wifi/java/android/net/wifi/IWifiManager.aidl \
		wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \
		telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \
		voip/java/android/net/sip/ISipSession.aidl \
		voip/java/android/net/sip/ISipSessionListener.aidl \

core/java/android/app/ContextImpl.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,8 @@ import android.net.IThrottleManager;
		import android.net.Uri;
		import android.net.wifi.IWifiManager;
		import android.net.wifi.WifiManager;
		import android.net.wifi.p2p.IWifiP2pManager;
		import android.net.wifi.p2p.WifiP2pManager;
		import android.nfc.NfcManager;
		import android.os.Binder;
		import android.os.Bundle;
		@@ -438,6 +440,13 @@ class ContextImpl extends Context {
		return new WifiManager(service, ctx.mMainThread.getHandler());
		}});

		registerService(WIFI_P2P_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		IBinder b = ServiceManager.getService(WIFI_P2P_SERVICE);
		IWifiP2pManager service = IWifiP2pManager.Stub.asInterface(b);
		return new WifiP2pManager(service);
		}});

		registerService(WINDOW_SERVICE, new ServiceFetcher() {
		public Object getService(ContextImpl ctx) {
		return WindowManagerImpl.getDefault(ctx.mPackageInfo.mCompatibilityInfo);

core/java/android/content/Context.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -1571,6 +1571,17 @@ public abstract class Context {
		*/
		public static final String WIFI_SERVICE = "wifi";

		/**
		* Use with {@link #getSystemService} to retrieve a {@link
		* android.net.wifi.p2p.WifiP2pManager} for handling management of
		* Wi-Fi p2p.
		*
		* @see #getSystemService
		* @see android.net.wifi.p2p.WifiP2pManager
		* @hide
		*/
		public static final String WIFI_P2P_SERVICE = "wifip2p";

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.media.AudioManager} for handling management of volume,

core/java/com/android/internal/util/Protocol.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,9 @@ public class Protocol {
		/** Non system protocols */
		public static final int BASE_WIFI = 0x00020000;
		public static final int BASE_WIFI_WATCHDOG = 0x00021000;
		public static final int BASE_WIFI_P2P_MANAGER = 0x00022000;
		public static final int BASE_WIFI_P2P_SERVICE = 0x00023000;
		public static final int BASE_WIFI_MONITOR = 0x00024000;
		public static final int BASE_DHCP = 0x00030000;
		public static final int BASE_DATA_CONNECTION = 0x00040000;
		public static final int BASE_DATA_CONNECTION_AC = 0x00041000;

core/jni/android_net_wifi_Wifi.cpp

+35 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,9 @@
		#define WIFI_PKG_NAME "android/net/wifi/WifiNative"
		#define BUF_SIZE 256

		//TODO: This file can be refactored to push a lot of the functionality to java
		//with just a few JNI calls - doBoolean/doInt/doString

		namespace android {

		static jboolean sScanModeActive = false;
		@@ -537,6 +540,35 @@ static void android_net_wifi_setScanIntervalCommand(JNIEnv* env, jobject, jint s
		}


		static jboolean android_net_wifi_doBooleanCommand(JNIEnv* env, jobject, jstring javaCommand)
		{
		ScopedUtfChars command(env, javaCommand);
		if (command.c_str() == NULL) {
		return JNI_FALSE;
		}
		return doBooleanCommand("OK", "%s", command.c_str());
		}

		static jint android_net_wifi_doIntCommand(JNIEnv* env, jobject, jstring javaCommand)
		{
		ScopedUtfChars command(env, javaCommand);
		if (command.c_str() == NULL) {
		return -1;
		}
		return doIntCommand("%s", command.c_str());
		}

		static jstring android_net_wifi_doStringCommand(JNIEnv* env, jobject, jstring javaCommand)
		{
		ScopedUtfChars command(env, javaCommand);
		if (command.c_str() == NULL) {
		return NULL;
		}
		return doStringCommand(env, "%s", command.c_str());
		}



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

		/*
		@@ -608,6 +640,9 @@ static JNINativeMethod gWifiMethods[] = {
		(void*) android_net_wifi_setCountryCodeCommand},
		{ "enableBackgroundScanCommand", "(Z)V", (void*) android_net_wifi_enableBackgroundScanCommand},
		{ "setScanIntervalCommand", "(I)V", (void*) android_net_wifi_setScanIntervalCommand},
		{ "doBooleanCommand", "(Ljava/lang/String;)Z", (void*) android_net_wifi_doBooleanCommand},
		{ "doIntCommand", "(Ljava/lang/String;)I", (void*) android_net_wifi_doIntCommand},
		{ "doStringCommand", "(Ljava/lang/String;)Ljava/lang/String;", (void*) android_net_wifi_doStringCommand},
		};

		int register_android_net_wifi_WifiManager(JNIEnv* env)