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

Commit ae4d5d93 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Check and block for network connectivity in onStart as well."

parents ede5e02f 43b5ea4a

core/java/android/app/ActivityThread.java

+3 −0
Original line number Diff line number Diff line
@@ -2962,6 +2962,7 @@ public final class ActivityThread { 
            r.activity.mTemporaryPause = true;

            mInstrumentation.callActivityOnPause(r.activity);

        }

        checkAndBlockForNetworkAccess();

        deliverNewIntents(r, intents);

        if (resumed) {

            r.activity.performResume();
@@ -3595,6 +3596,7 @@ public final class ActivityThread { 
            try {

                r.activity.onStateNotSaved();

                r.activity.mFragments.noteStateNotSaved();

                checkAndBlockForNetworkAccess();

                if (r.pendingIntents != null) {

                    deliverNewIntents(r, r.pendingIntents);

                    r.pendingIntents = null;
@@ -4350,6 +4352,7 @@ public final class ActivityThread { 
                    }

                }

            }

            checkAndBlockForNetworkAccess();

            deliverResults(r, res.results);

            if (resumed) {

                r.activity.performResume();

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -24148,7 +24148,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                record.networkStateLock.wait(mWaitForNetworkTimeoutMs);

                record.waitingForNetwork = false;

                final long totalTime = SystemClock.uptimeMillis() - startTime;

                if (totalTime >= mWaitForNetworkTimeoutMs) {

                if (totalTime >= mWaitForNetworkTimeoutMs || DEBUG_NETWORK) {

                    Slog.wtf(TAG_NETWORK, "Total time waited for network rules to get updated: "

                            + totalTime + ". Uid: " + callingUid + " procStateSeq: "

                            + procStateSeq + " UidRec: " + record