commit 4c937464ebc016a545d9a16fd65989c21dd4bc03
author Rebecca Silberstein <silberst@google.com> Thu Jan 19 21:21:23 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 19 21:21:23 2017 +0000
tree 0858556e2a3243fcdeef2b183f47f1a3266fe26e
parent a83222e4fbdc5eef936eb3834cbf02be05bfc19c
parent 5f506939fafd724fe4cdb8ef478302c8590417ce

Merge "SystemServer: cherry-pick p2p service start"

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 9e60f33..2477e71 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -840,7 +840,11 @@
                 } else {
                     Slog.i(TAG, "No Wi-Fi Aware Service (Aware 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");