Revert "Temporary fix for Car Service Test"
This reverts commit 8a92246cea909b36cefc563d41fcb972ab1f8702.
Reason for revert: b/273370593
Change-Id: Iae07e1b1b03b2bba76c6fccc2b21f58cbb7d29b0
diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index aa6f461..68c4930 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -225,11 +225,7 @@
() -> new VehicleHal(serviceContext, vehicle), allServices);
t.traceBegin("VHAL.earlyInit");
- if (false) {
- // TODO(b/273370593): Disabled to stablize tests
- mHal.priorityInit();
- }
-
+ mHal.priorityInit();
HalPropValue disabledOptionalFeatureValue = mHal.getIfSupportedOrFailForEarlyStage(
VehicleProperty.DISABLED_OPTIONAL_FEATURES, INITIAL_VHAL_GET_RETRY);
t.traceEnd();
@@ -280,11 +276,7 @@
maxRunningUsers, mCarUXRestrictionsService, mCarPackageManagerService),
allServices);
}
-
- if (false) {
- // TODO(b/273370593): Disabled to stablize tests
- mCarUserService.priorityInit();
- }
+ mCarUserService.priorityInit();
if (mFeatureController.isFeatureEnabled(Car.EXPERIMENTAL_CAR_USER_SERVICE)) {
mExperimentalCarUserService = constructWithTrace(t, ExperimentalCarUserService.class,
diff --git a/service/src/com/android/car/hal/VehicleHal.java b/service/src/com/android/car/hal/VehicleHal.java
index 3f0cf27..f953d46 100644
--- a/service/src/com/android/car/hal/VehicleHal.java
+++ b/service/src/com/android/car/hal/VehicleHal.java
@@ -353,9 +353,6 @@
@Override
public void init() {
// nothing to init as everything was done on priorityInit
-
- // TODO(b/273370593): remove following once tests are stable
- priorityInit();
}
/**
diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java
index 00e29ee..3ecf347 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -739,9 +739,6 @@
if (!isPlatformVersionAtLeastU()) {
mHandler.post(() -> initBootUser(getInitialUserInfoRequestType()));
}
-
- // TODO(b/273370593): remove following once tests are stable
- priorityInit();
}
private void initBootUser(int requestType) {
