diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-01-11 10:18:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-11 10:18:05 -0800 |
| commit | 24bc5331cd302bfdf83ebee14a6acff7b6b48a34 (patch) | |
| tree | fc89b68f8b74d4ab1462b8c9c2f32bfbceae2ce8 /core/java/android/content/SyncManager.java | |
| parent | 4bcfdef3d676d846f3c7209aaf26c849c0239cba (diff) | |
| parent | cef295780ade72a26201c0c92ed2b64fde03a261 (diff) | |
| download | frameworks_base-24bc5331cd302bfdf83ebee14a6acff7b6b48a34.zip frameworks_base-24bc5331cd302bfdf83ebee14a6acff7b6b48a34.tar.gz frameworks_base-24bc5331cd302bfdf83ebee14a6acff7b6b48a34.tar.bz2 | |
am cef29578: Merge "Change local names for greater clarity." into honeycomb
* commit 'cef295780ade72a26201c0c92ed2b64fde03a261':
Change local names for greater clarity.
Diffstat (limited to 'core/java/android/content/SyncManager.java')
| -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 0bce748..2fa2834 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -1377,8 +1377,8 @@ public class SyncManager implements OnAccountsUpdateListener { // to have the most recent value used. try { waitUntilReadyToRun(); - NetworkInfo info = getConnectivityManager().getActiveNetworkInfo(); - mDataConnectionIsConnected = (info != null) && info.isConnected(); + NetworkInfo networkInfo = getConnectivityManager().getActiveNetworkInfo(); + mDataConnectionIsConnected = (networkInfo != null) && networkInfo.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 |