diff options
| author | Sravan Kumar Reddy Kallu <skallu@google.com> | 2020-01-21 22:31:00 +0000 |
|---|---|---|
| committer | Sravan Kumar Reddy Kallu <skallu@google.com> | 2020-01-21 22:31:00 +0000 |
| commit | fba0b26d0f6026672e039fce60231817be2d024d (patch) | |
| tree | d60d34f87b7db83b5fee24247a64775b801d915e /services/java/com/android/server/SystemServer.java | |
| parent | 790637e2a42c433a99504b057793c8aed5b0deeb (diff) | |
Revert "SystemServer: Dynamically load wifi-service"
Revert "product: Remove wifi-service off SystemServerClassPath"
Revert submission 10103769-load_wifi_service_dynamically
Exempt-From-Owner-Approval: see go/perf-revert-first
Reason for revert: <Regression reported in b/148099857>
Reverted Changes:
I7b658cbfa: SystemServer: Dynamically load wifi-service
I93f2467d0: product: Remove wifi-service off SystemServerClass...
Change-Id: Icc0b680c2c6c472157b7bc9ee7bc7d97a54263c1
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index f41d40538517..3dee913ac035 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -223,14 +223,8 @@ public final class SystemServer { "com.android.server.usb.UsbService$Lifecycle"; private static final String MIDI_SERVICE_CLASS = "com.android.server.midi.MidiService$Lifecycle"; - private static final String WIFI_APEX_SERVICE_JAR_PATH = - "/apex/com.android.wifi/javalib/wifi-service.jar"; private static final String WIFI_SERVICE_CLASS = "com.android.server.wifi.WifiService"; - private static final String WIFI_SCANNING_SERVICE_CLASS = - "com.android.server.wifi.scanner.WifiScanningService"; - private static final String WIFI_RTT_SERVICE_CLASS = - "com.android.server.wifi.rtt.RttService"; private static final String WIFI_AWARE_SERVICE_CLASS = "com.android.server.wifi.aware.WifiAwareService"; private static final String WIFI_P2P_SERVICE_CLASS = @@ -1432,36 +1426,33 @@ public final class SystemServer { PackageManager.FEATURE_WIFI)) { // Wifi Service must be started first for wifi-related services. t.traceBegin("StartWifi"); - mSystemServiceManager.startServiceFromJar( - WIFI_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH); + mSystemServiceManager.startService(WIFI_SERVICE_CLASS); t.traceEnd(); t.traceBegin("StartWifiScanning"); - mSystemServiceManager.startServiceFromJar( - WIFI_SCANNING_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH); + mSystemServiceManager.startService( + "com.android.server.wifi.scanner.WifiScanningService"); t.traceEnd(); } if (context.getPackageManager().hasSystemFeature( PackageManager.FEATURE_WIFI_RTT)) { t.traceBegin("StartRttService"); - mSystemServiceManager.startServiceFromJar( - WIFI_RTT_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH); + mSystemServiceManager.startService( + "com.android.server.wifi.rtt.RttService"); t.traceEnd(); } if (context.getPackageManager().hasSystemFeature( PackageManager.FEATURE_WIFI_AWARE)) { t.traceBegin("StartWifiAware"); - mSystemServiceManager.startServiceFromJar( - WIFI_AWARE_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH); + mSystemServiceManager.startService(WIFI_AWARE_SERVICE_CLASS); t.traceEnd(); } if (context.getPackageManager().hasSystemFeature( PackageManager.FEATURE_WIFI_DIRECT)) { t.traceBegin("StartWifiP2P"); - mSystemServiceManager.startServiceFromJar( - WIFI_P2P_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH); + mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS); t.traceEnd(); } |