Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85de5061 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix reading property from persisted AdiDeviceState" into udc-qpr-dev... 

Merge "Fix reading property from persisted AdiDeviceState" into udc-qpr-dev am: 25854b70 am: e4e47634

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



Change-Id: I3a1b12a48d0adf6343b58b1177ef636b93b39138
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 208b0955 e4e47634

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

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ import java.util.Objects; 
            }

            final AdiDeviceState deviceState = new AdiDeviceState(deviceType,

                    internalDeviceType, fields[1]);

            deviceState.setHasHeadTracker(Integer.parseInt(fields[2]) == 1);

            deviceState.setSAEnabled(Integer.parseInt(fields[2]) == 1);

            deviceState.setHasHeadTracker(Integer.parseInt(fields[3]) == 1);

            deviceState.setHeadTrackerEnabled(Integer.parseInt(fields[4]) == 1);

            deviceState.setAudioDeviceCategory(audioDeviceCategory);