From f6324a4b758d9251e68f3cc543a5b54c26867d91 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Thu, 19 Jan 2017 14:42:18 -0800 Subject: [PATCH] AudioService: remove compile time options for a11y volume Remove test code path for the a11y volume and only rely on AccessibilityServicesStateChangeListener. Query whether any of the running a11y services expose FLAG_ENABLE_ACCESSIBILITY_VOLUME Test: enable a service that exposes FLAG_ENABLE_ACCESSIBILITY_VOLUME (Talkback will do this in the future) and change volume Bug 30448020 Change-Id: Ib5dff31313c0ec65b3e9982e35c00698adf5b7de --- .../android/server/audio/AudioService.java | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 31ef94fb5381e..213041e9e854b 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -144,7 +144,6 @@ import java.util.Objects; */ public class AudioService extends IAudioService.Stub implements AccessibilityManager.TouchExplorationStateChangeListener, - AccessibilityManager.AccessibilityStateChangeListener, AccessibilityManager.AccessibilityServicesStateChangeListener { private static final String TAG = "AudioService"; @@ -5926,25 +5925,13 @@ public class AudioService extends IAudioService.Stub //========================================================================================== // Accessibility - /** - * Compile-time constant to enable the use of an independent a11y volume: - * - set to true to listen to a11y services state changes and read - * the whether any exposes the FLAG_ENABLE_ACCESSIBILITY_VOLUME flag - * - set to false to listen to when accessibility services are started (e.g. "TalkBack started") - */ - private static final boolean USE_FLAG_ENABLE_ACCESSIBILITY_VOLUME = false; - private void initA11yMonitoring() { final AccessibilityManager accessibilityManager = (AccessibilityManager) mContext.getSystemService(Context.ACCESSIBILITY_SERVICE); updateDefaultStreamOverrideDelay(accessibilityManager.isTouchExplorationEnabled()); updateA11yVolumeAlias(accessibilityManager.isEnabled()); accessibilityManager.addTouchExplorationStateChangeListener(this); - if (USE_FLAG_ENABLE_ACCESSIBILITY_VOLUME) { - accessibilityManager.addAccessibilityServicesStateChangeListener(this); - } else { - accessibilityManager.addAccessibilityStateChangeListener(this); - } + accessibilityManager.addAccessibilityServicesStateChangeListener(this); } //--------------------------------------------------------------------------------- @@ -5982,12 +5969,6 @@ public class AudioService extends IAudioService.Stub private static boolean sIndependentA11yVolume = false; - // implementation of AccessibilityStateChangeListener - @Override - public void onAccessibilityStateChanged(boolean enabled) { - updateA11yVolumeAlias(enabled); - } - // implementation of AccessibilityServicesStateChangeListener @Override public void onAccessibilityServicesStateChanged() {