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

Commit 827d7cee authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix a stupid NPE" am: 72746119 am: 77ccd8d0 am: 2d9fd741 am: 64bad37a am: 61414566 

Change-Id: Ia64f68e32aef48c558e346d476bde89baa011b60
parents 78d5eb86 61414566

core/java/android/net/NetworkAgent.java

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

    public Network register() {

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

        final ConnectivityManager cm = (ConnectivityManager) mInitialConfiguration.context

                .getSystemService(Context.CONNECTIVITY_SERVICE);

        synchronized (mRegisterLock) {

            if (mNetwork != null) {

                throw new IllegalStateException("Agent already registered");

            }

            final ConnectivityManager cm = (ConnectivityManager) mInitialConfiguration.context

                    .getSystemService(Context.CONNECTIVITY_SERVICE);

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

                    new NetworkInfo(mInitialConfiguration.info),

                    mInitialConfiguration.properties, mInitialConfiguration.capabilities,