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

Merge "SpatializerHelper: Remove custom sensor handling" into tm-dev am: 1d5623f14b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18290065

Change-Id: I6c1cce03fae462d59a6f5c085a0e0ad82980d297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andy Hung
2022-05-11 21:22:02 +00:00
committed by Automerger Merge Worker
parent b6240695a8 1d5623f14b
commit 9da0f9e158
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,12 +70,6 @@ public class SpatializerHelper {
private @Nullable SensorManager mSensorManager; private @Nullable SensorManager mSensorManager;
//------------------------------------------------------------ //------------------------------------------------------------
/** head tracker sensor name */
// TODO: replace with generic head tracker sensor name.
// the current implementation refers to the "google" namespace but will be replaced
// by an android name at the next API level revision, it is not Google-specific.
private static final String HEADTRACKER_SENSOR =
"com.google.hardware.sensor.hid_dynamic.headtracker";
private static final SparseIntArray SPAT_MODE_FOR_DEVICE_TYPE = new SparseIntArray(15) { private static final SparseIntArray SPAT_MODE_FOR_DEVICE_TYPE = new SparseIntArray(15) {
{ {
@@ -1522,24 +1516,24 @@ public class SpatializerHelper {
private int getHeadSensorHandleUpdateTracker() { private int getHeadSensorHandleUpdateTracker() {
int headHandle = -1; int headHandle = -1;
UUID routingDeviceUuid = mAudioService.getDeviceSensorUuid(ROUTING_DEVICES[0]); UUID routingDeviceUuid = mAudioService.getDeviceSensorUuid(ROUTING_DEVICES[0]);
List<Sensor> sensors = new ArrayList<Sensor>(0); // We limit only to Sensor.TYPE_HEAD_TRACKER here to avoid confusion
sensors.addAll(mSensorManager.getDynamicSensorList(Sensor.TYPE_HEAD_TRACKER)); // with gaming sensors. (Note that Sensor.TYPE_ROTATION_VECTOR
sensors.addAll(mSensorManager.getDynamicSensorList(Sensor.TYPE_DEVICE_PRIVATE_BASE)); // and Sensor.TYPE_GAME_ROTATION_VECTOR are supported internally by
// SensorPoseProvider).
// Note: this is a dynamic sensor list right now.
List<Sensor> sensors = mSensorManager.getDynamicSensorList(Sensor.TYPE_HEAD_TRACKER);
for (Sensor sensor : sensors) { for (Sensor sensor : sensors) {
if (sensor.getType() == Sensor.TYPE_HEAD_TRACKER final UUID uuid = sensor.getUuid();
|| sensor.getStringType().equals(HEADTRACKER_SENSOR)) { if (uuid.equals(routingDeviceUuid)) {
UUID uuid = sensor.getUuid(); headHandle = sensor.getHandle();
if (uuid.equals(routingDeviceUuid)) { if (!setHasHeadTracker(ROUTING_DEVICES[0])) {
headHandle = sensor.getHandle(); headHandle = -1;
if (!setHasHeadTracker(ROUTING_DEVICES[0])) {
headHandle = -1;
}
break;
}
if (uuid.equals(UuidUtils.STANDALONE_UUID)) {
headHandle = sensor.getHandle();
break;
} }
break;
}
if (uuid.equals(UuidUtils.STANDALONE_UUID)) {
headHandle = sensor.getHandle();
// we do not break, perhaps we find a head tracker on device.
} }
} }
return headHandle; return headHandle;