diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java index 03dcc8d711d34..82fe6c6654dab 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java +++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java @@ -1914,7 +1914,7 @@ import java.util.concurrent.atomic.AtomicBoolean; return null; } - UUID getDeviceSensorUuid(AudioDeviceAttributes device) { + @Nullable UUID getDeviceSensorUuid(AudioDeviceAttributes device) { synchronized (mDeviceStateLock) { return mDeviceInventory.getDeviceSensorUuid(device); } diff --git a/services/core/java/com/android/server/audio/AudioDeviceInventory.java b/services/core/java/com/android/server/audio/AudioDeviceInventory.java index dbe4fb8c87957..82e68d9aa45fb 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceInventory.java +++ b/services/core/java/com/android/server/audio/AudioDeviceInventory.java @@ -16,6 +16,7 @@ package com.android.server.audio; import android.annotation.NonNull; +import android.annotation.Nullable; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; @@ -1495,7 +1496,7 @@ public class AudioDeviceInventory { mDevRoleCapturePresetDispatchers.finishBroadcast(); } - UUID getDeviceSensorUuid(AudioDeviceAttributes device) { + @Nullable UUID getDeviceSensorUuid(AudioDeviceAttributes device) { final String key = DeviceInfo.makeDeviceListKey(device.getInternalType(), device.getAddress()); synchronized (mDevicesLock) { diff --git a/services/core/java/com/android/server/audio/SpatializerHelper.java b/services/core/java/com/android/server/audio/SpatializerHelper.java index e27fb11418509..8356134bc63b3 100644 --- a/services/core/java/com/android/server/audio/SpatializerHelper.java +++ b/services/core/java/com/android/server/audio/SpatializerHelper.java @@ -353,6 +353,14 @@ public class SpatializerHelper { mASA.getDevicesForAttributes( DEFAULT_ATTRIBUTES, false /* forVolume */).toArray(ROUTING_DEVICES); + // check validity of routing information + if (ROUTING_DEVICES[0] == null) { + logloge("onRoutingUpdated: device is null, no Spatial Audio"); + setDispatchAvailableState(false); + // not changing the spatializer level as this is likely a transient state + return; + } + // is media routed to a new device? if (isWireless(ROUTING_DEVICES[0].getType())) { addWirelessDeviceIfNew(ROUTING_DEVICES[0]); @@ -1098,7 +1106,7 @@ public class SpatializerHelper { logDeviceState(deviceState, "setHeadTrackerEnabled"); // check current routing to see if it affects the headtracking mode - if (ROUTING_DEVICES[0].getType() == ada.getType() + if (ROUTING_DEVICES[0] != null && ROUTING_DEVICES[0].getType() == ada.getType() && ROUTING_DEVICES[0].getAddress().equals(ada.getAddress())) { setDesiredHeadTrackingMode(enabled ? mDesiredHeadTrackingModeWhenEnabled : Spatializer.HEAD_TRACKING_MODE_DISABLED); @@ -1633,7 +1641,11 @@ public class SpatializerHelper { private int getHeadSensorHandleUpdateTracker() { int headHandle = -1; - UUID routingDeviceUuid = mAudioService.getDeviceSensorUuid(ROUTING_DEVICES[0]); + final AudioDeviceAttributes currentDevice = ROUTING_DEVICES[0]; + if (currentDevice == null) { + return headHandle; + } + UUID routingDeviceUuid = mAudioService.getDeviceSensorUuid(currentDevice); // We limit only to Sensor.TYPE_HEAD_TRACKER here to avoid confusion // with gaming sensors. (Note that Sensor.TYPE_ROTATION_VECTOR // and Sensor.TYPE_GAME_ROTATION_VECTOR are supported internally by @@ -1644,7 +1656,7 @@ public class SpatializerHelper { final UUID uuid = sensor.getUuid(); if (uuid.equals(routingDeviceUuid)) { headHandle = sensor.getHandle(); - if (!setHasHeadTracker(ROUTING_DEVICES[0])) { + if (!setHasHeadTracker(currentDevice)) { headHandle = -1; } break;