follow-up fix failing carservice tests
- last patch missed
bug: 28387670
Change-Id: I6d4c29624308f3b6d4c3bbc43d19437da4cc0fec
diff --git a/service/src/com/android/car/CarVolumeControllerFactory.java b/service/src/com/android/car/CarVolumeControllerFactory.java
index 40cbf8d..e58cda1 100644
--- a/service/src/com/android/car/CarVolumeControllerFactory.java
+++ b/service/src/com/android/car/CarVolumeControllerFactory.java
@@ -16,8 +16,6 @@
package com.android.car;
-import java.util.HashMap;
-
import android.content.Context;
import android.media.AudioManager;
import android.media.IAudioService;
@@ -37,6 +35,9 @@
import com.android.car.hal.AudioHalService;
import com.android.internal.annotations.GuardedBy;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* A factory class to create {@link com.android.car.CarVolumeService.CarVolumeController} based
* on car properties.
@@ -293,7 +294,7 @@
// Here we just set it to the physical stream volume temporarily.
// when vhal does not work, get call can take long. For that case,
// for the same physical streams, cache initial get results
- HashMap<Integer, Integer> volumesPerCarStream = new HashMap<>();
+ Map<Integer, Integer> volumesPerCarStream = new HashMap<>();
for (int i : VolumeUtils.LOGICAL_STREAMS) {
int carStream = logicalStreamToCarStream(i);
Integer volume = volumesPerCarStream.get(carStream);