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

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

Issue 1100983005: Fix a crash in SigninManager.finishSignIn() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add log warning. 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..fd556aacb9fb9c7c7e89272176919c2421baebc8 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
@@ -395,6 +395,11 @@ public class SigninManager {
}
private void finishSignIn(AccountIdsAndNames accountIdsAndNames) {
+ if (mSignInAccount == null) {
+ Log.w(TAG, "Sign in request was canceled; aborting finishSignIn().");
+ return;
+ }
+
// Cache the signed-in account name.
ChromeSigninController.get(mContext).setSignedInAccountName(mSignInAccount.name);
« 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