diff options
| author | 2023-12-01 10:49:29 +0000 | |
|---|---|---|
| committer | 2023-12-01 10:49:29 +0000 | |
| commit | ed123d592aa7ed88b45db73d8da798066f12c980 (patch) | |
| tree | 1a2b68a0e4cad65ea147acbe230f6c1d766ea104 | |
| parent | c0a4c71b2c8f127de22df63c1ffeb5e544c78806 (diff) | |
| parent | f9abcbd4e2262e3f123b263555a07c1983393cb7 (diff) | |
Merge "SpatializerHelper: fix the null pointer exception occurred when create spatializer" into main am: f9abcbd4e2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2836278
Change-Id: Id2706c7694dbeaca1b6dbe676278a0f66c2f0631
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.java | 5 | 
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 18f24db8b307..f46586779f4c 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 @@ 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) {  |