summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'service/src/com/android/car/ICarImpl.java')
-rw-r--r--service/src/com/android/car/ICarImpl.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index ce5ea750..67c50a75 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -36,6 +36,7 @@ import android.util.Slog;
36import android.util.TimingsTraceLog; 36import android.util.TimingsTraceLog;
37 37
38import com.android.car.cluster.InstrumentClusterService; 38import com.android.car.cluster.InstrumentClusterService;
39import com.android.car.garagemode.GarageModeService;
39import com.android.car.hal.VehicleHal; 40import com.android.car.hal.VehicleHal;
40import com.android.car.internal.FeatureConfiguration; 41import com.android.car.internal.FeatureConfiguration;
41import com.android.car.pm.CarPackageManagerService; 42import com.android.car.pm.CarPackageManagerService;
@@ -122,8 +123,6 @@ public class ICarImpl extends ICar.Stub {
122 mCarInputService = new CarInputService(serviceContext, mHal.getInputHal()); 123 mCarInputService = new CarInputService(serviceContext, mHal.getInputHal());
123 mCarProjectionService = new CarProjectionService(serviceContext, mCarInputService); 124 mCarProjectionService = new CarProjectionService(serviceContext, mCarInputService);
124 mGarageModeService = new GarageModeService(mContext, mCarPowerManagementService); 125 mGarageModeService = new GarageModeService(mContext, mCarPowerManagementService);
125 mCarLocationService = new CarLocationService(mContext, mCarPowerManagementService,
126 mCarPropertyService);
127 mAppFocusService = new AppFocusService(serviceContext, mSystemActivityMonitoringService); 126 mAppFocusService = new AppFocusService(serviceContext, mSystemActivityMonitoringService);
128 mCarAudioService = new CarAudioService(serviceContext); 127 mCarAudioService = new CarAudioService(serviceContext);
129 mCarNightService = new CarNightService(serviceContext, mCarPropertyService); 128 mCarNightService = new CarNightService(serviceContext, mCarPropertyService);
@@ -142,6 +141,8 @@ public class ICarImpl extends ICar.Stub {
142 mCarConfigurationService = 141 mCarConfigurationService =
143 new CarConfigurationService(serviceContext, new JsonReaderImpl()); 142 new CarConfigurationService(serviceContext, new JsonReaderImpl());
144 mUserManagerHelper = new CarUserManagerHelper(serviceContext); 143 mUserManagerHelper = new CarUserManagerHelper(serviceContext);
144 mCarLocationService = new CarLocationService(mContext, mCarPowerManagementService,
145 mCarPropertyService, mUserManagerHelper);
145 146
146 // Be careful with order. Service depending on other service should be inited later. 147 // Be careful with order. Service depending on other service should be inited later.
147 List<CarServiceBase> allServices = new ArrayList<>(); 148 List<CarServiceBase> allServices = new ArrayList<>();
@@ -152,7 +153,6 @@ public class ICarImpl extends ICar.Stub {
152 allServices.add(mCarUXRestrictionsService); 153 allServices.add(mCarUXRestrictionsService);
153 allServices.add(mCarPackageManagerService); 154 allServices.add(mCarPackageManagerService);
154 allServices.add(mCarInputService); 155 allServices.add(mCarInputService);
155 allServices.add(mCarLocationService);
156 allServices.add(mGarageModeService); 156 allServices.add(mGarageModeService);
157 allServices.add(mAppFocusService); 157 allServices.add(mAppFocusService);
158 allServices.add(mCarAudioService); 158 allServices.add(mCarAudioService);
@@ -173,6 +173,7 @@ public class ICarImpl extends ICar.Stub {
173 allServices.add(mCarUserService); 173 allServices.add(mCarUserService);
174 } 174 }
175 175
176 allServices.add(mCarLocationService);
176 mAllServices = allServices.toArray(new CarServiceBase[allServices.size()]); 177 mAllServices = allServices.toArray(new CarServiceBase[allServices.size()]);
177 } 178 }
178 179