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

Merge "Disable WiFi p2p service if it's not supported."

Browse Source
This commit is contained in:
Wei Liu
2016-06-01 20:38:14 +00:00
committed by Android (Google) Code Review
parent 470baf3664 4e62ac5eef
commit 35fc682390
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

@@ -826,7 +826,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");