Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cef29578 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Change local names for greater clarity." into honeycomb

parents 52b13678 1b744ca4

core/java/android/content/SyncManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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