Index: chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java |
index 792a0ca8e7d8e069799aa6a73d3f354b9dad2f13..bfa92a1114fbd2edb2974fb727234779a114c57a 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java |
@@ -336,9 +336,11 @@ public class AccountSigninView extends FrameLayout implements ProfileDownloader. |
private boolean checkGooglePlayServicesAvailable() { |
ExternalAuthUtils extAuthUtils = ExternalAuthUtils.getInstance(); |
- boolean cancelable = !SigninManager.get(getContext()).isForceSigninEnabled(); |
- mGooglePlayServicesUpdateErrorHandler = new UserRecoverableErrorHandler.ModalDialog( |
- mDelegate.getActivity(), cancelable); |
+ if (mGooglePlayServicesUpdateErrorHandler == null) { |
+ boolean cancelable = !SigninManager.get(getContext()).isForceSigninEnabled(); |
estevenson
2017/01/11 19:35:12
I couldn't figure out if this can change during th
Bernhard Bauer
2017/01/12 10:14:33
According to https://cs.chromium.org/chromium/src/
estevenson
2017/01/12 19:52:33
Ahh cool, thanks!
|
+ mGooglePlayServicesUpdateErrorHandler = new UserRecoverableErrorHandler.ModalDialog( |
+ mDelegate.getActivity(), cancelable); |
+ } |
int resultCode = extAuthUtils.canUseGooglePlayServicesResultCode( |
getContext(), mGooglePlayServicesUpdateErrorHandler); |
if (extAuthUtils.isGooglePlayServicesUpdateRequiredError(resultCode)) { |