Merge "AudioService: remove compile time options for a11y volume" (b9a2b54a) · Commits · e / os / android_frameworks_base

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

+1 −20

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

		//---------------------------------------------------------------------------------
		@@ -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() {