Moving HalAudioFocus to com.android.car.audio.hal
Bug: 148178269
Test: atest com.android.car.audio
Change-Id: I298ed9eb26a025af9a5cb93caf2b8723e1a578fe
diff --git a/service/src/com/android/car/audio/CarAudioService.java b/service/src/com/android/car/audio/CarAudioService.java
index 6d244d1..4abeb73 100644
--- a/service/src/com/android/car/audio/CarAudioService.java
+++ b/service/src/com/android/car/audio/CarAudioService.java
@@ -65,6 +65,7 @@
import com.android.car.audio.hal.AudioControlFactory;
import com.android.car.audio.hal.AudioControlWrapper;
import com.android.car.audio.hal.AudioControlWrapperV1;
+import com.android.car.audio.hal.HalAudioFocus;
import com.android.internal.util.Preconditions;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/service/src/com/android/car/audio/HalAudioFocus.java b/service/src/com/android/car/audio/hal/HalAudioFocus.java
similarity index 95%
rename from service/src/com/android/car/audio/HalAudioFocus.java
rename to service/src/com/android/car/audio/hal/HalAudioFocus.java
index 2096c4c..eff0168 100644
--- a/service/src/com/android/car/audio/HalAudioFocus.java
+++ b/service/src/com/android/car/audio/hal/HalAudioFocus.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.audio;
+package com.android.car.audio.hal;
import static android.media.AudioManager.AUDIOFOCUS_LOSS;
import static android.media.AudioManager.AUDIOFOCUS_REQUEST_DELAYED;
@@ -34,7 +34,6 @@
import androidx.annotation.NonNull;
-import com.android.car.audio.hal.AudioControlWrapper;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.Preconditions;
@@ -44,7 +43,7 @@
/**
* Manages focus requests from the HAL on a per-zone per-usage basis
*/
-final class HalAudioFocus extends IFocusListener.Stub {
+public final class HalAudioFocus extends IFocusListener.Stub {
private static final String TAG = HalAudioFocus.class.getSimpleName();
private final AudioManager mAudioManager;
@@ -57,7 +56,7 @@
@GuardedBy("mImplLock")
private final SparseArray<SparseArray<HalAudioFocusRequest>> mHalFocusRequestsByZoneAndUsage;
- HalAudioFocus(@NonNull AudioManager audioManager,
+ public HalAudioFocus(@NonNull AudioManager audioManager,
@NonNull AudioControlWrapper audioControlWrapper,
@NonNull int[] audioZoneIds) {
mAudioManager = Objects.requireNonNull(audioManager);
@@ -70,11 +69,18 @@
}
}
- void registerFocusListener() {
+ /**
+ * Registers {@code IFocusListener} on {@code AudioControlWrapper} to receive HAL audio focus
+ * request and abandon calls.
+ */
+ public void registerFocusListener() {
mAudioControlWrapper.registerFocusListener(this);
}
- void unregisterFocusListener() {
+ /**
+ * Unregisters {@code IFocusListener} from {@code AudioControlWrapper}.
+ */
+ public void unregisterFocusListener() {
mAudioControlWrapper.unregisterFocusListener();
}
diff --git a/tests/carservice_unit_test/src/com/android/car/audio/HalAudioFocusTest.java b/tests/carservice_unit_test/src/com/android/car/audio/hal/HalAudioFocusTest.java
similarity index 99%
rename from tests/carservice_unit_test/src/com/android/car/audio/HalAudioFocusTest.java
rename to tests/carservice_unit_test/src/com/android/car/audio/hal/HalAudioFocusTest.java
index 4359fbf..310c984 100644
--- a/tests/carservice_unit_test/src/com/android/car/audio/HalAudioFocusTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/audio/hal/HalAudioFocusTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.audio;
+package com.android.car.audio.hal;
import static android.media.AudioAttributes.USAGE_ALARM;
import static android.media.AudioAttributes.USAGE_MEDIA;
@@ -45,8 +45,6 @@
import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.android.car.audio.hal.AudioControlWrapper;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
