Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "audio: SpatializerHelper: fix exceptions when head tracking is not supported" into tm-dev

Browse Source
This commit is contained in:
Eric Laurent
2022-03-17 19:36:22 +00:00
committed by Android (Google) Code Review
parent cc37f4e979 63300ce049
commit c479317fa9
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/audio/SpatializerHelper.java
View File

@@ -139,6 +139,7 @@ public class SpatializerHelper {
private @Nullable SpatializerCallback mSpatCallback;
private @Nullable SpatializerHeadTrackingCallback mSpatHeadTrackingCallback;
private @Nullable HelperDynamicSensorCallback mDynSensorCallback;
private boolean mIsHeadTrackingSupported = false;
// default attributes and format that determine basic availability of spatialization
private static final AudioAttributes DEFAULT_ATTRIBUTES = new AudioAttributes.Builder()
@@ -813,8 +814,9 @@ public class SpatializerHelper {
mSpat = AudioSystem.getSpatializer(mSpatCallback);
try {
mSpat.setLevel((byte) Spatializer.SPATIALIZER_IMMERSIVE_LEVEL_MULTICHANNEL);
mIsHeadTrackingSupported = mSpat.isHeadTrackingSupported();
//TODO: register heatracking callback only when sensors are registered
if (mSpat.isHeadTrackingSupported()) {
if (mIsHeadTrackingSupported) {
mSpat.registerHeadTrackingCallback(mSpatHeadTrackingCallback);
}
} catch (RemoteException e) {
@@ -832,12 +834,15 @@ public class SpatializerHelper {
if (mSpat != null) {
mSpatCallback = null;
try {
mSpat.registerHeadTrackingCallback(null);
if (mIsHeadTrackingSupported) {
mSpat.registerHeadTrackingCallback(null);
}
mHeadTrackerAvailable = false;
mSpat.release();
} catch (RemoteException e) {
Log.e(TAG, "Can't set release spatializer cleanly", e);
}
mIsHeadTrackingSupported = false;
mSpat = null;
}
}
@@ -1124,7 +1129,7 @@ public class SpatializerHelper {
}
break;
}
return true;
return mIsHeadTrackingSupported;
}
private void dispatchActualHeadTrackingMode(int newMode) {
@@ -1314,13 +1319,8 @@ public class SpatializerHelper {
Log.e(TAG, "not " + action + " sensors, null spatializer");
return;
}
try {
if (!mSpat.isHeadTrackingSupported()) {
Log.e(TAG, "not " + action + " sensors, spatializer doesn't support headtracking");
return;
}
} catch (RemoteException e) {
Log.e(TAG, "not " + action + " sensors, error querying headtracking", e);
if (!mIsHeadTrackingSupported) {
Log.e(TAG, "not " + action + " sensors, spatializer doesn't support headtracking");
return;
}
int headHandle = -1;