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

Commit e1d6c4d6 authored by Chalard Jean's avatar Chalard Jean
Browse files

Cleanup SystemReady in the network stack 

The system server (in SystemServer.java) defines the boot
sequence, during which an event called SystemReady happens.
This corresponds to a time when critical system services
that are depended upon by other components in the system
server are ready to handle requests from their dependencies.
Some system services are listening to this event to defer
initializations that depend on the critical services.

Because the network stack is only started after SystemReady,
there is no way any NetworkMonitor may be started before
SystemReady. Remove the associated mechanism.

Fix: 129376083
Test: FrameworksNetTests
Change-Id: I071eeb10d0b7c4f71af6653d322c7b442b2cc7ee
parent 675d4014

src/com/android/server/NetworkStackService.java

+0 −6
Original line number Diff line number Diff line
@@ -302,12 +302,6 @@ public class NetworkStackService extends Service { 
            mNm.notifyDnsResponse(returnCode);

        }



        @Override

        public void notifySystemReady() {

            checkNetworkStackCallingPermission();

            mNm.notifySystemReady();

        }



        @Override

        public void notifyNetworkConnected(LinkProperties lp, NetworkCapabilities nc) {

            checkNetworkStackCallingPermission();

src/com/android/server/connectivity/NetworkMonitor.java

+0 −15
Original line number Diff line number Diff line
@@ -298,8 +298,6 @@ public class NetworkMonitor extends StateMachine { 
    // Avoids surfacing "Sign in to network" notification.

    private boolean mDontDisplaySigninNotification = false;



    private volatile boolean mSystemReady = false;



    private final State mDefaultState = new DefaultState();

    private final State mValidatedState = new ValidatedState();

    private final State mMaybeNotifyState = new MaybeNotifyState();
@@ -433,15 +431,6 @@ public class NetworkMonitor extends StateMachine { 
        sendMessage(CMD_PRIVATE_DNS_SETTINGS_CHANGED, newCfg);

    }



    /**

     * Send a notification to NetworkMonitor indicating that the system is ready.

     */

    public void notifySystemReady() {

        // No need to run on the handler thread: mSystemReady is volatile and read only once on the

        // isCaptivePortal() thread.

        mSystemReady = true;

    }



    /**

     * Send a notification to NetworkMonitor indicating that the network is now connected.

     */
@@ -1592,10 +1581,6 @@ public class NetworkMonitor extends StateMachine { 
     */

    private void sendNetworkConditionsBroadcast(boolean responseReceived, boolean isCaptivePortal,

            long requestTimestampMs, long responseTimestampMs) {

        if (!mSystemReady) {

            return;

        }



        Intent latencyBroadcast =

                new Intent(NetworkMonitorUtils.ACTION_NETWORK_CONDITIONS_MEASURED);

        if (mNetworkCapabilities.hasTransport(TRANSPORT_WIFI)) {