Commit a43de6a2 authored by Alice Wang's avatar Alice Wang Committed by Chromium LUCI CQ

[Android][Signin] Remove redundant check in ForcedSigninProcessor

This CL removes the redundant check FirstRunUtils.canAllowSync() in
ForcedSigninProcessor.signinAndEnableSync(), as this method is
always called with an account from AccountManagerFacade,
FirstRunUtils.canAllowSync() is always true in
ForcedSigninProcessor.signinAndEnableSync().

Bug: 1045525
Change-Id: I6e7632b2b27de917497d9982cd7e95a4e76527c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2623289
Commit-Queue: Wenyu Fu <wenyufu@chromium.org>
Reviewed-by: default avatarWenyu Fu <wenyufu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842557}
parent d8040cd4
...@@ -62,8 +62,7 @@ public final class ForcedSigninProcessor { ...@@ -62,8 +62,7 @@ public final class ForcedSigninProcessor {
*/ */
private static void signinAndEnableSync(final Account childAccount) { private static void signinAndEnableSync(final Account childAccount) {
final Profile profile = Profile.getLastUsedRegularProfile(); final Profile profile = Profile.getLastUsedRegularProfile();
if (FirstRunUtils.canAllowSync() if (IdentityServicesProvider.get().getIdentityManager(profile).hasPrimaryAccount()) {
&& IdentityServicesProvider.get().getIdentityManager(profile).hasPrimaryAccount()) {
// TODO(https://crbug.com/1044206): Remove this. // TODO(https://crbug.com/1044206): Remove this.
ProfileSyncService.get().setFirstSetupComplete(SyncFirstSetupCompleteSource.BASIC_FLOW); ProfileSyncService.get().setFirstSetupComplete(SyncFirstSetupCompleteSource.BASIC_FLOW);
} }
...@@ -71,7 +70,7 @@ public final class ForcedSigninProcessor { ...@@ -71,7 +70,7 @@ public final class ForcedSigninProcessor {
IdentityServicesProvider.get().getSigninManager(profile); IdentityServicesProvider.get().getSigninManager(profile);
// By definition we have finished all the checks for first run. // By definition we have finished all the checks for first run.
signinManager.onFirstRunCheckDone(); signinManager.onFirstRunCheckDone();
if (FirstRunUtils.canAllowSync() && signinManager.isSignInAllowed()) { if (signinManager.isSignInAllowed()) {
signinManager.signinAndEnableSync(SigninAccessPoint.FORCED_SIGNIN, childAccount, signinManager.signinAndEnableSync(SigninAccessPoint.FORCED_SIGNIN, childAccount,
new SigninManager.SignInCallback() { new SigninManager.SignInCallback() {
@Override @Override
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment