diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-01-11 10:19:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-11 10:19:40 -0800 |
| commit | 486bca10f5a245fa04ad7ea5ba2acba2f9c82d33 (patch) | |
| tree | d638fad41edeb828faf91a8eb0f1a270c3265d23 /core/java/android/content/SyncManager.java | |
| parent | 3e6129684f10e661e61eb081da16708a2f0018d8 (diff) | |
| parent | 24bc5331cd302bfdf83ebee14a6acff7b6b48a34 (diff) | |
| download | frameworks_base-486bca10f5a245fa04ad7ea5ba2acba2f9c82d33.zip frameworks_base-486bca10f5a245fa04ad7ea5ba2acba2f9c82d33.tar.gz frameworks_base-486bca10f5a245fa04ad7ea5ba2acba2f9c82d33.tar.bz2 | |
am 24bc5331: am cef29578: Merge "Change local names for greater clarity." into honeycomb
* commit '24bc5331cd302bfdf83ebee14a6acff7b6b48a34':
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 3ada94a..f45cf2a 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -1378,8 +1378,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 |