commit 5f506939fafd724fe4cdb8ef478302c8590417ce
author Wei Liu <luciferleo@google.com> Mon May 23 15:12:49 2016 -0700
committer Rebecca Silberstein <silberst@google.com> Wed Jan 18 11:01:10 2017 -0800
tree df9eefb0dcbef25c90871a20f93732516e437e84
parent c82d1ddaf46f09252a9360cb1fbd047d53057661

SystemServer: cherry-pick p2p service start

Cherry-pick change that only starts P2P service if p2p is supported for
the device.

Disable WiFi p2p service if it's not supported.

b/26877020

Bug:34193861
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: manually verified wifi connection
Test: manually checked for p2p peers

Change-Id: I84b822fa57423711de75d2147effe73a1fc40eb4
Merged-In: 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 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");