Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cef29578: Merge "Change local names for greater clarity." into honeycomb

Browse Source 
* commit 'cef295780ade72a26201c0c92ed2b64fde03a261':
  Change local names for greater clarity.
This commit is contained in:
Robert Greenwalt
2011-01-11 10:18:05 -08:00
committed by Android Git Automerger
parent 4bcfdef3d6 cef295780a
commit 24bc5331cd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/SyncManager.java
View File

@@ -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