From f0e136a5db88626365086bd91bb9981ebc745734 Mon Sep 17 00:00:00 2001 From: Jacky Kao Date: Tue, 8 Feb 2022 13:49:54 +0800 Subject: [PATCH] Changes the name of the live caption APIs Changes the name of the APIs to reflect the methods actually do. Bug: 216474106 Test: atest CaptioningManagerTest Change-Id: I152fa9b791be0f35bdc78478e0eb0d524c120e51 --- core/api/current.txt | 4 ++-- core/api/system-current.txt | 4 ++-- .../accessibility/AccessibilityManager.java | 14 +++++------ .../view/accessibility/CaptioningManager.java | 24 +++++++++---------- .../accessibility/IAccessibilityManager.aidl | 12 ++++------ .../AccessibilityManagerService.java | 16 ++++++------- .../accessibility/CaptioningManagerImpl.java | 6 ++--- 7 files changed, 38 insertions(+), 42 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 0e82509c1ddc9..5c9941fa41240 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -51949,8 +51949,8 @@ package android.view.accessibility { method @NonNull public android.view.accessibility.CaptioningManager.CaptionStyle getUserStyle(); method public boolean isCallCaptioningEnabled(); method public final boolean isEnabled(); - method public final boolean isSystemAudioCaptioningRequested(); - method public final boolean isSystemAudioCaptioningUiRequested(); + method public final boolean isSystemAudioCaptioningEnabled(); + method public final boolean isSystemAudioCaptioningUiEnabled(); method public void removeCaptioningChangeListener(@NonNull android.view.accessibility.CaptioningManager.CaptioningChangeListener); } diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 6267dbf376f77..598d3a781904c 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -15522,8 +15522,8 @@ package android.view.accessibility { } public class CaptioningManager { - method @RequiresPermission(android.Manifest.permission.SET_SYSTEM_AUDIO_CAPTION) public final void setSystemAudioCaptioningRequested(boolean); - method @RequiresPermission(android.Manifest.permission.SET_SYSTEM_AUDIO_CAPTION) public final void setSystemAudioCaptioningUiRequested(boolean); + method @RequiresPermission(android.Manifest.permission.SET_SYSTEM_AUDIO_CAPTION) public final void setSystemAudioCaptioningEnabled(boolean); + method @RequiresPermission(android.Manifest.permission.SET_SYSTEM_AUDIO_CAPTION) public final void setSystemAudioCaptioningUiEnabled(boolean); } } diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index e54ed18c51a6f..c6cd2e81bbf58 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -1773,8 +1773,7 @@ public final class AccessibilityManager { * @param userId The user Id. * @hide */ - @RequiresPermission(Manifest.permission.SET_SYSTEM_AUDIO_CAPTION) - public void setSystemAudioCaptioningRequested(boolean isEnabled, int userId) { + public void setSystemAudioCaptioningEnabled(boolean isEnabled, int userId) { final IAccessibilityManager service; synchronized (mLock) { service = getServiceLocked(); @@ -1783,7 +1782,7 @@ public final class AccessibilityManager { } } try { - service.setSystemAudioCaptioningRequested(isEnabled, userId); + service.setSystemAudioCaptioningEnabled(isEnabled, userId); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); } @@ -1796,7 +1795,7 @@ public final class AccessibilityManager { * @return the system audio caption UI enabled state. * @hide */ - public boolean isSystemAudioCaptioningUiRequested(int userId) { + public boolean isSystemAudioCaptioningUiEnabled(int userId) { final IAccessibilityManager service; synchronized (mLock) { service = getServiceLocked(); @@ -1805,7 +1804,7 @@ public final class AccessibilityManager { } } try { - return service.isSystemAudioCaptioningUiRequested(userId); + return service.isSystemAudioCaptioningUiEnabled(userId); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); } @@ -1818,8 +1817,7 @@ public final class AccessibilityManager { * @param userId The user Id. * @hide */ - @RequiresPermission(Manifest.permission.SET_SYSTEM_AUDIO_CAPTION) - public void setSystemAudioCaptioningUiRequested(boolean isEnabled, int userId) { + public void setSystemAudioCaptioningUiEnabled(boolean isEnabled, int userId) { final IAccessibilityManager service; synchronized (mLock) { service = getServiceLocked(); @@ -1828,7 +1826,7 @@ public final class AccessibilityManager { } } try { - service.setSystemAudioCaptioningUiRequested(isEnabled, userId); + service.setSystemAudioCaptioningUiEnabled(isEnabled, userId); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); } diff --git a/core/java/android/view/accessibility/CaptioningManager.java b/core/java/android/view/accessibility/CaptioningManager.java index 4f9781b6b6af3..e960bec67763c 100644 --- a/core/java/android/view/accessibility/CaptioningManager.java +++ b/core/java/android/view/accessibility/CaptioningManager.java @@ -152,7 +152,7 @@ public class CaptioningManager { /** * @return the system audio caption enabled state. */ - public final boolean isSystemAudioCaptioningRequested() { + public final boolean isSystemAudioCaptioningEnabled() { return Secure.getIntForUser(mContentResolver, Secure.ODI_CAPTIONS_ENABLED, SYSTEM_AUDIO_CAPTIONING_DEFAULT_ENABLED ? 1 : 0, mContext.getUserId()) == 1; } @@ -169,9 +169,9 @@ public class CaptioningManager { */ @SystemApi @RequiresPermission(Manifest.permission.SET_SYSTEM_AUDIO_CAPTION) - public final void setSystemAudioCaptioningRequested(boolean isEnabled) { + public final void setSystemAudioCaptioningEnabled(boolean isEnabled) { if (mAccessibilityManager != null) { - mAccessibilityManager.setSystemAudioCaptioningRequested(isEnabled, + mAccessibilityManager.setSystemAudioCaptioningEnabled(isEnabled, mContext.getUserId()); } } @@ -179,9 +179,9 @@ public class CaptioningManager { /** * @return the system audio caption UI enabled state. */ - public final boolean isSystemAudioCaptioningUiRequested() { + public final boolean isSystemAudioCaptioningUiEnabled() { return mAccessibilityManager != null - && mAccessibilityManager.isSystemAudioCaptioningUiRequested(mContext.getUserId()); + && mAccessibilityManager.isSystemAudioCaptioningUiEnabled(mContext.getUserId()); } /** @@ -196,9 +196,9 @@ public class CaptioningManager { */ @SystemApi @RequiresPermission(Manifest.permission.SET_SYSTEM_AUDIO_CAPTION) - public final void setSystemAudioCaptioningUiRequested(boolean isEnabled) { + public final void setSystemAudioCaptioningUiEnabled(boolean isEnabled) { if (mAccessibilityManager != null) { - mAccessibilityManager.setSystemAudioCaptioningUiRequested(isEnabled, + mAccessibilityManager.setSystemAudioCaptioningUiEnabled(isEnabled, mContext.getUserId()); } } @@ -300,7 +300,7 @@ public class CaptioningManager { } private void notifySystemAudioCaptionChanged() { - final boolean enabled = isSystemAudioCaptioningRequested(); + final boolean enabled = isSystemAudioCaptioningEnabled(); synchronized (mListeners) { for (CaptioningChangeListener listener : mListeners) { listener.onSystemAudioCaptioningChanged(enabled); @@ -309,7 +309,7 @@ public class CaptioningManager { } private void notifySystemAudioCaptionUiChanged() { - final boolean enabled = isSystemAudioCaptioningUiRequested(); + final boolean enabled = isSystemAudioCaptioningUiEnabled(); synchronized (mListeners) { for (CaptioningChangeListener listener : mListeners) { listener.onSystemAudioCaptioningUiChanged(enabled); @@ -686,7 +686,7 @@ public class CaptioningManager { * @param isEnabled The system audio captioning enabled state. * @param userId The user Id. */ - void setSystemAudioCaptioningRequested(boolean isEnabled, int userId); + void setSystemAudioCaptioningEnabled(boolean isEnabled, int userId); /** * Gets the system audio caption UI enabled state. @@ -694,7 +694,7 @@ public class CaptioningManager { * @param userId The user Id. * @return the system audio caption UI enabled state. */ - boolean isSystemAudioCaptioningUiRequested(int userId); + boolean isSystemAudioCaptioningUiEnabled(int userId); /** * Sets the system audio caption UI enabled state. @@ -702,6 +702,6 @@ public class CaptioningManager { * @param isEnabled The system audio captioning UI enabled state. * @param userId The user Id. */ - void setSystemAudioCaptioningUiRequested(boolean isEnabled, int userId); + void setSystemAudioCaptioningUiEnabled(boolean isEnabled, int userId); } } diff --git a/core/java/android/view/accessibility/IAccessibilityManager.aidl b/core/java/android/view/accessibility/IAccessibilityManager.aidl index 645ddf5542f74..418132a6e5978 100644 --- a/core/java/android/view/accessibility/IAccessibilityManager.aidl +++ b/core/java/android/view/accessibility/IAccessibilityManager.aidl @@ -101,13 +101,11 @@ interface IAccessibilityManager { boolean isAudioDescriptionByDefaultEnabled(); - // Requires Manifest.permission.SET_SYSTEM_AUDIO_CAPTION - // System process only - void setSystemAudioCaptioningRequested(boolean isEnabled, int userId); + @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.SET_SYSTEM_AUDIO_CAPTION)") + void setSystemAudioCaptioningEnabled(boolean isEnabled, int userId); - boolean isSystemAudioCaptioningUiRequested(int userId); + boolean isSystemAudioCaptioningUiEnabled(int userId); - // Requires Manifest.permission.SET_SYSTEM_AUDIO_CAPTION - // System process only - void setSystemAudioCaptioningUiRequested(boolean isEnabled, int userId); + @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.SET_SYSTEM_AUDIO_CAPTION)") + void setSystemAudioCaptioningUiEnabled(boolean isEnabled, int userId); } diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 5b580d9d829c6..9467fa9bf9eb0 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -3463,27 +3463,27 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub @Override @RequiresPermission(Manifest.permission.SET_SYSTEM_AUDIO_CAPTION) - public void setSystemAudioCaptioningRequested(boolean isEnabled, int userId) { + public void setSystemAudioCaptioningEnabled(boolean isEnabled, int userId) { mContext.enforceCallingOrSelfPermission( Manifest.permission.SET_SYSTEM_AUDIO_CAPTION, - "setSystemAudioCaptioningRequested"); + "setSystemAudioCaptioningEnabled"); - mCaptioningManagerImpl.setSystemAudioCaptioningRequested(isEnabled, userId); + mCaptioningManagerImpl.setSystemAudioCaptioningEnabled(isEnabled, userId); } @Override - public boolean isSystemAudioCaptioningUiRequested(int userId) { - return mCaptioningManagerImpl.isSystemAudioCaptioningUiRequested(userId); + public boolean isSystemAudioCaptioningUiEnabled(int userId) { + return mCaptioningManagerImpl.isSystemAudioCaptioningUiEnabled(userId); } @Override @RequiresPermission(Manifest.permission.SET_SYSTEM_AUDIO_CAPTION) - public void setSystemAudioCaptioningUiRequested(boolean isEnabled, int userId) { + public void setSystemAudioCaptioningUiEnabled(boolean isEnabled, int userId) { mContext.enforceCallingOrSelfPermission( Manifest.permission.SET_SYSTEM_AUDIO_CAPTION, - "setSystemAudioCaptioningUiRequested"); + "setSystemAudioCaptioningUiEnabled"); - mCaptioningManagerImpl.setSystemAudioCaptioningUiRequested(isEnabled, userId); + mCaptioningManagerImpl.setSystemAudioCaptioningUiEnabled(isEnabled, userId); } @Override diff --git a/services/accessibility/java/com/android/server/accessibility/CaptioningManagerImpl.java b/services/accessibility/java/com/android/server/accessibility/CaptioningManagerImpl.java index 39780d21486d6..0fc6c8d4bab59 100644 --- a/services/accessibility/java/com/android/server/accessibility/CaptioningManagerImpl.java +++ b/services/accessibility/java/com/android/server/accessibility/CaptioningManagerImpl.java @@ -40,7 +40,7 @@ public class CaptioningManagerImpl implements CaptioningManager.SystemAudioCapti * @param userId The user Id. */ @Override - public void setSystemAudioCaptioningRequested(boolean isEnabled, int userId) { + public void setSystemAudioCaptioningEnabled(boolean isEnabled, int userId) { final long identity = Binder.clearCallingIdentity(); try { Settings.Secure.putIntForUser(mContext.getContentResolver(), @@ -57,7 +57,7 @@ public class CaptioningManagerImpl implements CaptioningManager.SystemAudioCapti * @return the system audio caption UI enabled state. */ @Override - public boolean isSystemAudioCaptioningUiRequested(int userId) { + public boolean isSystemAudioCaptioningUiEnabled(int userId) { final long identity = Binder.clearCallingIdentity(); try { return Settings.Secure.getIntForUser(mContext.getContentResolver(), @@ -75,7 +75,7 @@ public class CaptioningManagerImpl implements CaptioningManager.SystemAudioCapti * @param userId The user Id. */ @Override - public void setSystemAudioCaptioningUiRequested(boolean isEnabled, int userId) { + public void setSystemAudioCaptioningUiEnabled(boolean isEnabled, int userId) { final long identity = Binder.clearCallingIdentity(); try { Settings.Secure.putIntForUser(mContext.getContentResolver(),