commit 4e62ac5eefd9e93c47e085bbbebf17ce80b7be0c
author Wei Liu <luciferleo@google.com> Mon May 23 15:12:49 2016 -0700
committer Wei Liu <luciferleo@google.com> Mon May 23 22:25:51 2016 +0000
tree 75a26af7e9e0b29fd00c963b866be62c246e2de6
parent d6de352fdd4b28821840b885f6fd0611559ffc17

Disable WiFi p2p service if it's not supported.

b/26877020

Change-Id: I84b822fa57423711de75d2147effe73a1fc40eb4

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 4f54e87..baae34d 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -823,7 +823,11 @@
                 } else {
                     Slog.i(TAG, "No Wi-Fi NAN Service (NAN support Not Present)");
                 }
-                mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS);
+
+                if (context.getPackageManager().hasSystemFeature(
+                        PackageManager.FEATURE_WIFI_DIRECT)) {
+                    mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS);
+                }
                 mSystemServiceManager.startService(WIFI_SERVICE_CLASS);
                 mSystemServiceManager.startService(
                             "com.android.server.wifi.scanner.WifiScanningService");