diff options
author | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 21:54:41 +0000 |
---|---|---|
committer | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 21:54:41 +0000 |
commit | 7ca02c4ad3536a941819f9ff9fab730bba64bb25 (patch) | |
tree | 6552dd2c903f988bf2fdbe5d57ef727ba4be3adf | |
parent | 13bc9079b7166242e63380db6c862aa2127bac96 (diff) | |
download | chromium_src-7ca02c4ad3536a941819f9ff9fab730bba64bb25.zip chromium_src-7ca02c4ad3536a941819f9ff9fab730bba64bb25.tar.gz chromium_src-7ca02c4ad3536a941819f9ff9fab730bba64bb25.tar.bz2 |
Merge 275089 "Avoid calling Activity.isDestroyed()."
> Avoid calling Activity.isDestroyed().
>
> That call is only available since API level 17.
>
> This refactoring replaces SigninManager.Observer with SigninManager.Delegate,
> which has the same callbacks and 2 additional calls to get the Activity to use
> for sign-in and another to check if that Activity hasn't been destroyed next.
>
> BUG=380210
>
> Review URL: https://codereview.chromium.org/312923002
TBR=joaodasilva@chromium.org
Review URL: https://codereview.chromium.org/399113004
git-svn-id: svn://svn.chromium.org/chrome/branches/1985_122/src@283896 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 f2eb434..fc1ba02 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 @@ -13,6 +13,8 @@ import android.content.DialogInterface; import android.os.Handler; import android.util.Log; +import org.chromium.base.ActivityState; +import org.chromium.base.ApplicationStatus; import org.chromium.base.CalledByNative; import org.chromium.base.ObserverList; import org.chromium.base.ThreadUtils; @@ -204,7 +206,7 @@ public class SigninManager { return; } - if (mSignInActivity.isDestroyed()) { + if (ApplicationStatus.getStateForActivity(mSignInActivity) == ActivityState.DESTROYED) { // The activity is no longer running, cancel sign in. cancelSignIn(); return; |