Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f506939 authored by Wei Liu's avatar Wei Liu Committed by Rebecca Silberstein
Browse files

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
parent c82d1dda

services/java/com/android/server/SystemServer.java

+5 −1
Original line number Diff line number Diff line
@@ -840,7 +840,11 @@ public final class SystemServer { 
                } else {

                    Slog.i(TAG, "No Wi-Fi Aware Service (Aware support Not Present)");

                }



                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");