Merge "Wifi hotspot stack initial hook up" (93627ac8) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -289,6 +289,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/hotspot/IWifiHotspotManager.aidl \
		wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \
		packages/services/PacProcessor/com/android/net/IProxyService.aidl \
		packages/services/Proxy/com/android/net/IProxyCallback.aidl \

+14 −0

Original line number	Diff line number	Diff line
		@@ -6490,6 +6490,7 @@ package android.content {
		field public static final java.lang.String USER_SERVICE = "user";
		field public static final java.lang.String VIBRATOR_SERVICE = "vibrator";
		field public static final java.lang.String WALLPAPER_SERVICE = "wallpaper";
		field public static final java.lang.String WIFI_HOTSPOT_SERVICE = "wifihotspot";
		field public static final java.lang.String WIFI_P2P_SERVICE = "wifip2p";
		field public static final java.lang.String WIFI_SERVICE = "wifi";
		field public static final java.lang.String WINDOW_SERVICE = "window";
		@@ -16200,6 +16201,19 @@ package android.net.wifi {

		}

		package android.net.wifi.hotspot {

		public abstract interface IWifiHotspotManager implements android.os.IInterface {
		method public abstract void test() throws android.os.RemoteException;
		}

		public class WifiHotspotManager {
		ctor public WifiHotspotManager(android.content.Context, android.net.wifi.hotspot.IWifiHotspotManager);
		method public void test();
		}

		}

		package android.net.wifi.p2p {

		public class WifiP2pConfig implements android.os.Parcelable {

+9 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,8 @@ import android.net.nsd.INsdManager;
		import android.net.nsd.NsdManager;
		import android.net.wifi.IWifiManager;
		import android.net.wifi.WifiManager;
		import android.net.wifi.hotspot.IWifiHotspotManager;
		import android.net.wifi.hotspot.WifiHotspotManager;
		import android.net.wifi.p2p.IWifiP2pManager;
		import android.net.wifi.p2p.WifiP2pManager;
		import android.nfc.NfcManager;
		@@ -552,6 +554,13 @@ class ContextImpl extends Context {
		return new WifiManager(ctx.getOuterContext(), service);
		}});

		registerService(WIFI_HOTSPOT_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		IBinder b = ServiceManager.getService(WIFI_HOTSPOT_SERVICE);
		IWifiHotspotManager service = IWifiHotspotManager.Stub.asInterface(b);
		return new WifiHotspotManager(ctx.getOuterContext(), service);
		}});

		registerService(WIFI_P2P_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		IBinder b = ServiceManager.getService(WIFI_P2P_SERVICE);

+11 −0

Original line number	Diff line number	Diff line
		@@ -1974,6 +1974,7 @@ public abstract class Context {
		//@hide: NETWORK_STATS_SERVICE,
		//@hide: NETWORK_POLICY_SERVICE,
		WIFI_SERVICE,
		WIFI_HOTSPOT_SERVICE,
		WIFI_P2P_SERVICE,
		NSD_SERVICE,
		AUDIO_SERVICE,
		@@ -2322,6 +2323,16 @@ public abstract class Context {
		*/
		public static final String WIFI_SERVICE = "wifi";

		/**
		* Use with {@link #getSystemService} to retrieve a {@link
		* android.net.wifi.hotspot.WifiHotspotManager} for handling management of
		* Wi-Fi hotspot access.
		*
		* @see #getSystemService
		* @see android.net.wifi.hotspot.WifiHotspotManager
		*/
		public static final String WIFI_HOTSPOT_SERVICE = "wifihotspot";

		/**
		* Use with {@link #getSystemService} to retrieve a {@link
		* android.net.wifi.p2p.WifiP2pManager} for handling management of

+8 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,8 @@ public final class SystemServer {
		"com.android.server.usb.UsbService$Lifecycle";
		private static final String WIFI_SERVICE_CLASS =
		"com.android.server.wifi.WifiService";
		private static final String WIFI_HOTSPOT_SERVICE_CLASS =
		"com.android.server.wifi.hotspot.WifiHotspotService";
		private static final String WIFI_P2P_SERVICE_CLASS =
		"com.android.server.wifi.p2p.WifiP2pService";
		private static final String HDMI_CEC_SERVICE_CLASS =
		@@ -613,6 +615,12 @@ public final class SystemServer {
		reportWtf("starting Wi-Fi P2pService", e);
		}

		try {
		mSystemServiceManager.startService(WIFI_HOTSPOT_SERVICE_CLASS);
		} catch (Throwable e) {
		reportWtf("starting Wi-Fi HotspotService", e);
		}

		try {
		mSystemServiceManager.startService(WIFI_SERVICE_CLASS);
		} catch (Throwable e) {