From 7592b986e13b1af76dc6c6a10f758ad2f371997a Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Wed, 1 Feb 2017 15:12:15 -0800 Subject: [PATCH] AudioService: query a11y manager at init for a11y volume active When initializing accessibility state monitoring, query the accessibility manager whether any service is enabling the accessibility volume Test: adb shell dumpsys audio, look for sIndependentA11yVolume Bug: 30448020 Change-Id: Ie8c32e10a35f4eef5fdeadacccefaaec1cdfb022 --- services/core/java/com/android/server/audio/AudioService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index ef792b0b84f84..1d60946129a73 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -5933,7 +5933,7 @@ public class AudioService extends IAudioService.Stub final AccessibilityManager accessibilityManager = (AccessibilityManager) mContext.getSystemService(Context.ACCESSIBILITY_SERVICE); updateDefaultStreamOverrideDelay(accessibilityManager.isTouchExplorationEnabled()); - updateA11yVolumeAlias(accessibilityManager.isEnabled()); + updateA11yVolumeAlias(accessibilityManager.isAccessibilityVolumeStreamActive()); accessibilityManager.addTouchExplorationStateChangeListener(this); accessibilityManager.addAccessibilityServicesStateChangeListener(this); } @@ -6066,6 +6066,7 @@ public class AudioService extends IAudioService.Stub pw.print(" mSafeMediaVolumeState="); pw.println(safeMediaVolumeStateToString(mSafeMediaVolumeState)); pw.print(" mSafeMediaVolumeIndex="); pw.println(mSafeMediaVolumeIndex); + pw.print(" sIndependentA11yVolume="); pw.println(sIndependentA11yVolume); pw.print(" mPendingVolumeCommand="); pw.println(mPendingVolumeCommand); pw.print(" mMusicActiveMs="); pw.println(mMusicActiveMs); pw.print(" mMcc="); pw.println(mMcc);