Merge "Fix new account not shown for work profile."

This commit is contained in:
Doris Ling
2018-07-24 17:57:43 +00:00
committed by Android (Google) Code Review
2 changed files with 44 additions and 6 deletions

View File

@@ -192,12 +192,10 @@ public class AccountPreferenceController extends AbstractPreferenceController
data.screenTitle = screenTitle;
rawData.add(data);
}
{
SearchIndexableRaw data = new SearchIndexableRaw(mContext);
data.title = res.getString(R.string.managed_profile_settings_title);
data.screenTitle = screenTitle;
rawData.add(data);
}
SearchIndexableRaw data = new SearchIndexableRaw(mContext);
data.title = res.getString(R.string.managed_profile_settings_title);
data.screenTitle = screenTitle;
rawData.add(data);
}
}
}
@@ -300,6 +298,7 @@ public class AccountPreferenceController extends AbstractPreferenceController
final ProfileData data = mProfiles.get(userInfo.id);
if (data != null) {
data.pendingRemoval = false;
data.userInfo = userInfo;
if (userInfo.isEnabled()) {
// recreate the authentication helper to refresh the list of enabled accounts
data.authenticatorHelper =