summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2023-12-01 11:13:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-01 11:13:20 +0000
commit907e9bc2362c0d50792cde2ddbafb72e82e716f5 (patch)
treec1e6299e549bb8bb4ae764b76d168115abb83554
parent96f9d8b895043a4ad8307ddcb0330d05254d6aa0 (diff)
parentf85e1f83ccb68f788b0cb6e7be71a9409e096fad (diff)
Merge "SpatializerHelper: fix the null pointer exception occurred when create spatializer" into main am: f9abcbd4e2 am: f85e1f83cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2836278 Change-Id: Ic9155454899526033ae70a65c05eeb0d15f3d8c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/audio/SpatializerHelper.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/audio/SpatializerHelper.java b/services/core/java/com/android/server/audio/SpatializerHelper.java
index 7abd9c7f750b..157f117424ba 100644
--- a/services/core/java/com/android/server/audio/SpatializerHelper.java
+++ b/services/core/java/com/android/server/audio/SpatializerHelper.java
@@ -1013,6 +1013,11 @@ public class SpatializerHelper {
if (mSpat == null) {
mSpatCallback = new SpatializerCallback();
mSpat = AudioSystem.getSpatializer(mSpatCallback);
+ if (mSpat == null) {
+ Log.e(TAG, "createSpat(): No Spatializer found");
+ postReset();
+ return;
+ }
try {
//TODO: register heatracking callback only when sensors are registered
if (mIsHeadTrackingSupported) {