Merge "Fix issue for new account not being shown in work profile." into oc-dev

am: dd7912e12f

Change-Id: I343ca041d57d45511bb33d1ef3cd6ceae6c03d40

src/com/android/settings/accounts/AccountPreferenceController.java

@@ -299,6 +299,11 @@ public class AccountPreferenceController extends PreferenceController
         final ProfileData data = mProfiles.get(userInfo.id);
         if (data != null) {
             data.pendingRemoval = false;
+            if (userInfo.isEnabled()) {
+                // recreate the authentication helper to refresh the list of enabled accounts
+                data.authenticatorHelper =
+                    new AuthenticatorHelper(mContext, userInfo.getUserHandle(), this);
+            }
             return;
         }
         final Context context = mContext;