Commit bc93fc88 authored by Boris Sazonov's avatar Boris Sazonov Committed by Commit Bot

[Signin][Android] Don't show Google Play services dialog from SigninManager

This CL modifies sign-in flow SigninManager to remove the code that
shows error dialogs from Google Play services. Now these dialogs are
redundant, as Google Play services availability is checked from
SystemAccountManagerDelegate.checkCanUseGooglePlayServices, so if
there is no usable Google Play services package on the device, then
accounts won't be exposed from AccountManagerFacade at all.

Bug: 997218
Change-Id: I0ada3b6165387677c33a82b75e23bc38757d2f26
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1808861
Commit-Queue: Alex Ilin <alexilin@chromium.org>
Auto-Submit: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: default avatarAlex Ilin <alexilin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697291}
parent 164c7fa5
...@@ -27,7 +27,6 @@ import org.chromium.base.metrics.RecordHistogram; ...@@ -27,7 +27,6 @@ import org.chromium.base.metrics.RecordHistogram;
import org.chromium.base.metrics.RecordUserAction; import org.chromium.base.metrics.RecordUserAction;
import org.chromium.base.task.PostTask; import org.chromium.base.task.PostTask;
import org.chromium.chrome.browser.externalauth.ExternalAuthUtils; import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
import org.chromium.chrome.browser.externalauth.UserRecoverableErrorHandler;
import org.chromium.components.signin.AccountIdProvider; import org.chromium.components.signin.AccountIdProvider;
import org.chromium.components.signin.AccountManagerFacade; import org.chromium.components.signin.AccountManagerFacade;
import org.chromium.components.signin.AccountTrackerService; import org.chromium.components.signin.AccountTrackerService;
...@@ -459,8 +458,6 @@ public class SigninManager ...@@ -459,8 +458,6 @@ public class SigninManager
} else if (AccountIdProvider.getInstance().canBeUsed()) { } else if (AccountIdProvider.getInstance().canBeUsed()) {
mSignInState.mBlockedOnAccountSeeding = true; mSignInState.mBlockedOnAccountSeeding = true;
} else { } else {
Activity activity = mSignInState.mActivity;
handleGooglePlayServicesUnavailability(activity, !isForceSigninEnabled());
Log.w(TAG, "Cancelling the sign-in process as Google Play services is unavailable"); Log.w(TAG, "Cancelling the sign-in process as Google Play services is unavailable");
abortSignIn(); abortSignIn();
} }
...@@ -752,13 +749,6 @@ public class SigninManager ...@@ -752,13 +749,6 @@ public class SigninManager
return SigninManagerJni.get().extractDomainName(email); return SigninManagerJni.get().extractDomainName(email);
} }
private void handleGooglePlayServicesUnavailability(Activity activity, boolean cancelable) {
UserRecoverableErrorHandler errorHandler = activity != null
? new UserRecoverableErrorHandler.ModalDialog(activity, cancelable)
: new UserRecoverableErrorHandler.SystemNotification();
ExternalAuthUtils.getInstance().canUseGooglePlayServices(errorHandler);
}
private boolean isGooglePlayServicesPresent(Context context) { private boolean isGooglePlayServicesPresent(Context context) {
return !ExternalAuthUtils.getInstance().isGooglePlayServicesMissing(context); return !ExternalAuthUtils.getInstance().isGooglePlayServicesMissing(context);
} }
......
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