commit 55bc5f3e0408bcb5a39a6732de0b2d1aa99a55be
author repo sync <isheriff@google.com> Fri Jun 24 14:23:07 2011 -0700
committer Irfan Sheriff <isheriff@google.com> Sun Jul 24 10:08:47 2011 -0700
tree 1206af1015ea8248a8fefbf2672d8df7bfa56bc8
parent 895de9269fa125bf3903c21faf5e8d2750bfb000

Updated: Wi-Fi p2p framework

First stage. Get the bones in right now even though
we are not ready on the native side.

Once, we have things underneath working - we will further update the
framework

Change-Id: I4a7dab5cd4267373dc5f8989ae4122f91c384ed5

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 76665915..f15eca6 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -37,6 +37,7 @@
 import android.server.BluetoothA2dpService;
 import android.server.BluetoothService;
 import android.server.search.SearchManagerService;
+import android.server.WifiP2pService;
 import android.util.DisplayMetrics;
 import android.util.EventLog;
 import android.util.Slog;
@@ -108,6 +109,7 @@
         NetworkStatsService networkStats = null;
         NetworkPolicyManagerService networkPolicy = null;
         ConnectivityService connectivity = null;
+        WifiP2pService wifiP2p = null;
         IPackageManager pm = null;
         Context context = null;
         WindowManagerService wm = null;
@@ -299,6 +301,14 @@
                 Slog.e(TAG, "Failure starting NetworkPolicy Service", e);
             }
 
+           try {
+                Slog.i(TAG, "Wi-Fi P2pService");
+                wifiP2p = new WifiP2pService(context);
+                ServiceManager.addService(Context.WIFI_P2P_SERVICE, wifiP2p);
+            } catch (Throwable e) {
+                Slog.e(TAG, "Failure starting Wi-Fi P2pService", e);
+            }
+
             try {
                 Slog.i(TAG, "Connectivity Service");
                 connectivity = new ConnectivityService(context, networkManagement, networkPolicy);