diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-01-10 16:32:09 -0800 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-01-10 17:09:25 -0800 |
| commit | 03b15b976c7ba1a45e423fd3743fc7a28c28a7d9 (patch) | |
| tree | cc196b694d20dbb07c7e7f80dc2bd77091bfb097 /core/java/android/content | |
| parent | d2c78b39724d1d7b6e4f7bd54d0022c2847e9127 (diff) | |
| download | frameworks_base-03b15b976c7ba1a45e423fd3743fc7a28c28a7d9.zip frameworks_base-03b15b976c7ba1a45e423fd3743fc7a28c28a7d9.tar.gz frameworks_base-03b15b976c7ba1a45e423fd3743fc7a28c28a7d9.tar.bz2 | |
Don't check for services before boot-complete
fixes the build
Change-Id: I2ee55d9aaad53dac16fa8182df3a7b43b57eb719
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/SyncManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java index 58739da..0bce748 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -1375,10 +1375,10 @@ public class SyncManager implements OnAccountsUpdateListener { long nextPendingSyncTime = Long.MAX_VALUE; // Setting the value here instead of a method because we want the dumpsys logs // to have the most recent value used. - mDataConnectionIsConnected = - getConnectivityManager().getActiveNetworkInfo().isConnected(); try { waitUntilReadyToRun(); + NetworkInfo info = getConnectivityManager().getActiveNetworkInfo(); + mDataConnectionIsConnected = (info != null) && info.isConnected(); mSyncManagerWakeLock.acquire(); // Always do this first so that we be sure that any periodic syncs that // are ready to run have been converted into pending syncs. This allows the |