From 4e62ac5eefd9e93c47e085bbbebf17ce80b7be0c Mon Sep 17 00:00:00 2001
From: Wei Liu <luciferleo@google.com>
Date: Mon, 23 May 2016 15:12:49 -0700
Subject: [PATCH] Disable WiFi p2p service if it's not supported.

b/26877020

Change-Id: I84b822fa57423711de75d2147effe73a1fc40eb4
---
 services/java/com/android/server/SystemServer.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 4f54e8744c6a6..baae34dffaa23 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -823,7 +823,11 @@ public final class SystemServer {
                 } 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");