Remove unnecessary CarNotConnectedException catches.
Simplify CarService and associated tests by removing the now-useless
catch (CarNotConnectedException) blocks and associated code.
Bug: 33250970
Test: mmma packages/services/Car;
atest CarServiceTest AndroidCarApiTest VehicleHALTest
Change-Id: I12299ff4d4a8e4701cbee04cd527627f325f7989
diff --git a/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/E2ePerformanceTest.java b/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/E2ePerformanceTest.java
index d2f6669..56ce568 100644
--- a/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/E2ePerformanceTest.java
+++ b/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/E2ePerformanceTest.java
@@ -23,7 +23,6 @@
import android.annotation.Nullable;
import android.car.Car;
-import android.car.CarNotConnectedException;
import android.car.hardware.CarPropertyConfig;
import android.car.hardware.CarSensorManager;
import android.car.hardware.CarSensorManager.OnSensorChangedListener;
@@ -234,12 +233,8 @@
while (counter.getCount() > 0) {
float actualValue;
- try {
- mgr.setFloatProperty(cfg.getPropertyId(), areaId, curValue);
- actualValue = mgr.getFloatProperty(cfg.getPropertyId(), areaId);
- } catch (CarNotConnectedException e) {
- throw new RuntimeException(e);
- }
+ mgr.setFloatProperty(cfg.getPropertyId(), areaId, curValue);
+ actualValue = mgr.getFloatProperty(cfg.getPropertyId(), areaId);
assertEquals(curValue, actualValue, 0.001);
curValue += 0.5;
if (curValue > maxValue) {
@@ -251,9 +246,8 @@
}
@Nullable
- private <T> CarPropertyConfig<T> findHvacPropConfig(Class<T> clazz, int hvacPropId,
- CarHvacManager mgr)
- throws CarNotConnectedException {
+ private <T> CarPropertyConfig<T> findHvacPropConfig(
+ Class<T> clazz, int hvacPropId, CarHvacManager mgr) {
for (CarPropertyConfig<?> cfg : mgr.getPropertyList()) {
if (cfg.getPropertyId() == hvacPropId) {
return (CarPropertyConfig<T>) cfg;