From 449bcc36bdac0336a16ef65ce79809ad84c30cce Mon Sep 17 00:00:00 2001 From: Kaiqiang Wang Date: Thu, 23 Sep 2021 18:07:37 +0000 Subject: [PATCH] Revert "Create Public API in AccessibilityManager to expose Audi..." Revert "Update AudioDescription read/write from Settings.Secure,..." Revert "Add CTS tests for AccessibilityManager.isAudioDescriptio..." Revert submission 15617076-AudioDescriptionPublicAPI Reason for revert: Raise Memorytest failures: b/200728759, b/200746876. Reverted Changes: Ic11e0bc4f:Add CTS tests for AccessibilityManager.isAudioDesc... I8f3908513:Update AudioDescription read/write from Settings.S... Iecf006bc8:Create Public API in AccessibilityManager to expos... Bug: 200728759 Bug: 200746876 Change-Id: Ic5b63bd5e9196f24638d36c05c3fa209c1afbcec --- core/api/current.txt | 1 - core/java/android/provider/Settings.java | 16 ++++++------ .../accessibility/AccessibilityManager.java | 25 ------------------- .../android/provider/SettingsBackupTest.java | 2 +- 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 316853889572d..fab08a5202141 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -50832,7 +50832,6 @@ package android.view.accessibility { method public int getRecommendedTimeoutMillis(int, int); method public void interrupt(); method public static boolean isAccessibilityButtonSupported(); - method public boolean isAudioDescriptionEnabled(); method public boolean isEnabled(); method public boolean isTouchExplorationEnabled(); method public void removeAccessibilityRequestPreparer(android.view.accessibility.AccessibilityRequestPreparer); diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index c52b48a9c7fe3..7002a380f1d89 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7219,14 +7219,6 @@ public final class Settings { public static final String ENABLED_ACCESSIBILITY_SERVICES = "enabled_accessibility_services"; - /** - * Whether select sound track with audio description by default. - * @hide - */ - @Readable - public static final String ENABLE_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT = - "enable_accessibility_audio_description_by_default"; - /** * List of the notified non-accessibility category accessibility services. * @@ -10383,6 +10375,14 @@ public final class Settings { public static final String ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED = "enable_accessibility_global_gesture_enabled"; + /** + * Whether select sound track with audio description by default. + * @hide + */ + @Readable + public static final String ENABLE_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT = + "enable_accessibility_audio_description_by_default"; + /** * Whether Airplane Mode is on. */ diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index 0606b5c26946d..17fad7e57de77 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -36,7 +36,6 @@ import android.annotation.UserIdInt; import android.app.RemoteAction; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -55,7 +54,6 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemClock; import android.os.UserHandle; -import android.provider.Settings; import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; @@ -273,8 +271,6 @@ public final class AccessibilityManager { */ private SparseArray> mRequestPreparerLists; - private ContentResolver mContentResolver; - /** * Listener for the system accessibility state. To listen for changes to the * accessibility state on the device, implement this interface and register @@ -487,7 +483,6 @@ public final class AccessibilityManager { mCallback = new MyCallback(); mHandler = new Handler(context.getMainLooper(), mCallback); mUserId = userId; - mContentResolver = context.getContentResolver(); synchronized (mLock) { initialFocusAppearanceLocked(context.getResources()); tryConnectToServiceLocked(service); @@ -512,7 +507,6 @@ public final class AccessibilityManager { mCallback = new MyCallback(); mHandler = handler; mUserId = userId; - mContentResolver = context.getContentResolver(); synchronized (mLock) { initialFocusAppearanceLocked(context.getResources()); if (serviceConnect) { @@ -1826,25 +1820,6 @@ public final class AccessibilityManager { return res.getBoolean(com.android.internal.R.bool.config_showNavigationBar); } - /** - * Determines if users want to select sound track with audio description by default. - * - * Audio description, also referred to as a video description, described video, or - * more precisely called a visual description, is a form of narration used to provide - * information surrounding key visual elements in a media work for the benefit of - * blind and visually impaired consumers. - * - * The method provides the preference value to content provider apps to select the - * default sound track during playing a video or movie. - * - * @return {@code true} if the audio description is enabled, {@code false} otherwise. - */ - public boolean isAudioDescriptionEnabled() { - return Settings.Secure.getInt( - mContentResolver, - Settings.Secure.ENABLE_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT, 0) == 1; - } - private final class MyCallback implements Handler.Callback { public static final int MSG_SET_STATE = 1; diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 4ebfbd29d7b92..df7bf20af9f38 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -272,6 +272,7 @@ public class SettingsBackupTest { Settings.Global.DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD, Settings.Global.SMART_REPLIES_IN_NOTIFICATIONS_FLAGS, Settings.Global.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS, + Settings.Global.ENABLE_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT, Settings.Global.ENABLE_ADB_INCREMENTAL_INSTALL_DEFAULT, Settings.Global.ENABLE_MULTI_SLOT_TIMEOUT_MILLIS, Settings.Global.ENHANCED_4G_MODE_ENABLED, @@ -721,7 +722,6 @@ public class SettingsBackupTest { Settings.Secure.DOCKED_CLOCK_FACE, Settings.Secure.DOZE_PULSE_ON_LONG_PRESS, Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION, - Settings.Secure.ENABLE_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT, Settings.Secure.ENABLED_INPUT_METHODS, // Intentionally removed in P Settings.Secure.ENABLED_NOTIFICATION_ASSISTANT, Settings.Secure.ENABLED_NOTIFICATION_LISTENERS,