From 0a62017612c6c23bdd975c61e64ad3411309b5d2 Mon Sep 17 00:00:00 2001
From: ryanlwlin <ryanlwlin@google.com>
Date: Wed, 27 May 2020 20:13:39 +0800
Subject: [PATCH] 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
---
 .../server/accessibility/AccessibilityManagerService.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index 07bb3356aec07..22b082f84a84b 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) {