Android: Make sure the NetworkChangeNotifier is initialized in getAut…

…hToken BUG=224019 Review URL: https://chromiumcodereview.appspot.com/14424008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196396 0039d316-1c4b-4281-b951-d872f2087c98
dednal · Apr 25, 2013 · 950e33e · 950e33e
1 parent f3c083d
commit 950e33e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java b/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java
@@ -67,6 +67,10 @@ public static NetworkChangeNotifier init(Context context) {
         return sInstance;
     }
 
+    public static boolean isInitialized() {
+        return sInstance != null;
+    }
+
     static void resetInstanceForTests(Context context) {
         sInstance = new NetworkChangeNotifier(context);
     }

diff --git a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
@@ -246,7 +246,8 @@ public String doInBackground(Void... params) {
             @Override
             public void onPostExecute(String authToken) {
                 if (authToken != null || !errorEncountered.get() ||
-                        numTries.incrementAndGet() == MAX_TRIES) {
+                        numTries.incrementAndGet() == MAX_TRIES ||
+                        !NetworkChangeNotifier.isInitialized()) {
                     callback.tokenAvailable(authToken);
                     return;
                 }