Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3436)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java

Issue 1073943003: [Android] Fix sign-in crash fix. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed asserts Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
index 1e74bb82def6f5764ca6efb4e9f6da6e6e99b796..6f13d9571c8a464311b11f53fcdf7d0edf8a7f1d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
@@ -280,9 +280,10 @@ public class SigninManager {
*/
public void startSignIn(Activity activity, final Account account, boolean passive,
final SignInFlowObserver observer) {
- assert mSignInActivity == null;
- assert mSignInAccount == null;
- assert mSignInFlowObserver == null;
+ if (mSignInAccount != null) {
+ Log.w(TAG, "Ignoring sign-in request as another sign-in request is pending.");
+ return;
+ }
if (mFirstRunCheckIsPending) {
Log.w(TAG, "Ignoring sign-in request until the First Run check completes.");
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698