Merge "SpatializerHelper: report head tracking disabled" into tm-dev am: 591aa05f60 am: 00cf40a48d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18418342

Change-Id: Ie7106dc13cb0d7cf1699d7da9b9bfc02202503e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jean-Michel Trivi
2022-05-18 22:09:44 +00:00
committed by Automerger Merge Worker

View File

@@ -243,6 +243,9 @@ public class SpatializerHelper {
}
mActualHeadTrackingMode =
headTrackingModeTypeToSpatializerInt(spat.getActualHeadTrackingMode());
} else {
mDesiredHeadTrackingModeWhenEnabled = Spatializer.HEAD_TRACKING_MODE_UNSUPPORTED;
mDesiredHeadTrackingMode = Spatializer.HEAD_TRACKING_MODE_UNSUPPORTED;
}
byte[] spatModes = spat.getSupportedModes();
@@ -1048,6 +1051,10 @@ public class SpatializerHelper {
}
synchronized void setHeadTrackerEnabled(boolean enabled, @NonNull AudioDeviceAttributes ada) {
if (!mIsHeadTrackingSupported) {
Log.v(TAG, "no headtracking support, ignoring setHeadTrackerEnabled to " + enabled
+ " for " + ada);
}
final int deviceType = ada.getType();
final boolean wireless = isWireless(deviceType);
@@ -1075,6 +1082,10 @@ public class SpatializerHelper {
}
synchronized boolean hasHeadTracker(@NonNull AudioDeviceAttributes ada) {
if (!mIsHeadTrackingSupported) {
Log.v(TAG, "no headtracking support, hasHeadTracker always false for " + ada);
return false;
}
final int deviceType = ada.getType();
final boolean wireless = isWireless(deviceType);
@@ -1094,6 +1105,10 @@ public class SpatializerHelper {
* @return true if the head tracker is enabled, false otherwise or if device not found
*/
synchronized boolean setHasHeadTracker(@NonNull AudioDeviceAttributes ada) {
if (!mIsHeadTrackingSupported) {
Log.v(TAG, "no headtracking support, setHasHeadTracker always false for " + ada);
return false;
}
final int deviceType = ada.getType();
final boolean wireless = isWireless(deviceType);
@@ -1113,6 +1128,10 @@ public class SpatializerHelper {
}
synchronized boolean isHeadTrackerEnabled(@NonNull AudioDeviceAttributes ada) {
if (!mIsHeadTrackingSupported) {
Log.v(TAG, "no headtracking support, isHeadTrackerEnabled always false for " + ada);
return false;
}
final int deviceType = ada.getType();
final boolean wireless = isWireless(deviceType);