commit f9abcbd4e2262e3f123b263555a07c1983393cb7
author Eric Laurent <elaurent@google.com> Fri Dec 01 09:33:14 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 01 09:33:14 2023 +0000
tree c1ea3b3e2875e115dfa0a63513d5f32f807e3c7b
parent baa658bcedf7aca3b3aa2a4a47d6c28d805a4d67
parent be0757171d4f114b1a9357679412a1c0d9057686

Merge "SpatializerHelper: fix the null pointer exception occurred when create spatializer" into main

services/core/java/com/android/server/audio/SpatializerHelper.java

diff --git a/services/core/java/com/android/server/audio/SpatializerHelper.java b/services/core/java/com/android/server/audio/SpatializerHelper.java
index 18f24db..f465867 100644
--- a/services/core/java/com/android/server/audio/SpatializerHelper.java
+++ b/services/core/java/com/android/server/audio/SpatializerHelper.java
@@ -965,6 +965,11 @@
         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) {