Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SystemServer: cherry-pick p2p service start" am: 4c937464eb am: 392f7d789c

Browse Source 
am: d3ff73eba4

Change-Id: I9427fd6c760c58c6caf65800fbbfbaf2c35e3335
This commit is contained in:
Rebecca Silberstein
2017-01-19 21:36:03 +00:00
committed by android-build-merger
parent 520e74a2bc d3ff73eba4
commit da4ea530ee
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/SystemServer.java
View File

@@ -842,7 +842,11 @@ public final class SystemServer {
} 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");