diff options
| author | ryanlwlin <ryanlwlin@google.com> | 2020-05-27 20:13:39 +0800 |
|---|---|---|
| committer | ryanlwlin <ryanlwlin@google.com> | 2020-05-27 20:13:39 +0800 |
| commit | 0a62017612c6c23bdd975c61e64ad3411309b5d2 (patch) | |
| tree | de9e79077e203dbe3123960f679526a0c6b4981d /services/accessibility | |
| parent | 2cdbcea8ba29bbb8d50511a9fa6e5bd2763fb153 (diff) | |
Fix Accessibility Menu setting is not restored by D2D
From Android R, we add ButtonTargets settings value for the shortcut feature.
It has dependency with enabled services requesting the Accessibility
button. In D2D case, we don't update it.
We mirgate the ButtonTargets value if enabled services are changed by D2D.
Bug: 156459064
Test: manual test:
1. prepare an Android Q device and an Android R device
2. backup settings value of Android Q device by google account.
3. Launch setupwizard to restore it by google account.
Change-Id: I8924171162be84f9a24ca3ea124234118b1183f5
Diffstat (limited to 'services/accessibility')
| -rw-r--r-- | services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 07bb3356aec0..22b082f84a84 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -1136,6 +1136,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub userState.mEnabledServices, UserHandle.USER_SYSTEM); onUserStateChangedLocked(userState); + migrateAccessibilityButtonSettingsIfNecessaryLocked(userState, null); } private int getClientStateLocked(AccessibilityUserState userState) { |