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

Merge "Fix FDE" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-17 16:48:29 +00:00
committed by Android (Google) Code Review
parent 7168c3baac 54271901cd
commit 729ebf23ab
1 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1111,45 +1111,47 @@ public final class SystemServer {
} }
traceEnd(); traceEnd();
if (context.getPackageManager().hasSystemFeature( if (!mOnlyCore) {
PackageManager.FEATURE_WIFI)) { if (context.getPackageManager().hasSystemFeature(
// Wifi Service must be started first for wifi-related services. PackageManager.FEATURE_WIFI)) {
traceBeginAndSlog("StartWifi"); // Wifi Service must be started first for wifi-related services.
mSystemServiceManager.startService(WIFI_SERVICE_CLASS); traceBeginAndSlog("StartWifi");
traceEnd(); mSystemServiceManager.startService(WIFI_SERVICE_CLASS);
traceBeginAndSlog("StartWifiScanning"); traceEnd();
mSystemServiceManager.startService( traceBeginAndSlog("StartWifiScanning");
"com.android.server.wifi.scanner.WifiScanningService"); mSystemServiceManager.startService(
traceEnd(); "com.android.server.wifi.scanner.WifiScanningService");
} traceEnd();
}
if (context.getPackageManager().hasSystemFeature( if (context.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_WIFI_RTT)) { PackageManager.FEATURE_WIFI_RTT)) {
traceBeginAndSlog("StartRttService"); traceBeginAndSlog("StartRttService");
mSystemServiceManager.startService( mSystemServiceManager.startService(
"com.android.server.wifi.rtt.RttService"); "com.android.server.wifi.rtt.RttService");
traceEnd(); traceEnd();
} }
if (context.getPackageManager().hasSystemFeature( if (context.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_WIFI_AWARE)) { PackageManager.FEATURE_WIFI_AWARE)) {
traceBeginAndSlog("StartWifiAware"); traceBeginAndSlog("StartWifiAware");
mSystemServiceManager.startService(WIFI_AWARE_SERVICE_CLASS); mSystemServiceManager.startService(WIFI_AWARE_SERVICE_CLASS);
traceEnd(); traceEnd();
} }
if (context.getPackageManager().hasSystemFeature( if (context.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_WIFI_DIRECT)) { PackageManager.FEATURE_WIFI_DIRECT)) {
traceBeginAndSlog("StartWifiP2P"); traceBeginAndSlog("StartWifiP2P");
mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS); mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS);
traceEnd(); traceEnd();
} }
if (context.getPackageManager().hasSystemFeature( if (context.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_LOWPAN)) { PackageManager.FEATURE_LOWPAN)) {
traceBeginAndSlog("StartLowpan"); traceBeginAndSlog("StartLowpan");
mSystemServiceManager.startService(LOWPAN_SERVICE_CLASS); mSystemServiceManager.startService(LOWPAN_SERVICE_CLASS);
traceEnd(); traceEnd();
}
} }
if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_ETHERNET) || if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_ETHERNET) ||