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

Commit 3a52d0f7 authored by Chalard Jean's avatar Chalard Jean Committed by Automerger Merge Worker
Browse files

Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e55 am: 007bff06 

Change-Id: I7253344ece9d28b8573b6f1cbf2652b2c06c3e7e
parents 24598b6a 007bff06

core/java/android/net/NetworkAgent.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -556,12 +556,12 @@ public abstract class NetworkAgent { 
    @NonNull

    @NonNull

    public Network register() {

    public Network register() {

        if (VDBG) log("Registering NetworkAgent");

        if (VDBG) log("Registering NetworkAgent");

        final ConnectivityManager cm = (ConnectivityManager) mInitialConfiguration.context

                .getSystemService(Context.CONNECTIVITY_SERVICE);

        synchronized (mRegisterLock) {

        synchronized (mRegisterLock) {

            if (mNetwork != null) {

            if (mNetwork != null) {

                throw new IllegalStateException("Agent already registered");

                throw new IllegalStateException("Agent already registered");

            }

            }

            final ConnectivityManager cm = (ConnectivityManager) mInitialConfiguration.context

                    .getSystemService(Context.CONNECTIVITY_SERVICE);

            mNetwork = cm.registerNetworkAgent(new Messenger(mHandler),

            mNetwork = cm.registerNetworkAgent(new Messenger(mHandler),

                    new NetworkInfo(mInitialConfiguration.info),

                    new NetworkInfo(mInitialConfiguration.info),

                    mInitialConfiguration.properties, mInitialConfiguration.capabilities,

                    mInitialConfiguration.properties, mInitialConfiguration.capabilities,