commit 16f4882784f4d345249ba13fb1b2e195a085873b
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 07 05:53:10 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 07 05:53:10 2020 +0000
tree cca6f427a13e2d3321fc5ab04812d1b1435758fb
parent b51a47360b0b0ec70c53ee58b5f4903ca42b0a14
parent 380318053b74d311a7a609a7b05d33e1e7d37b50

Merge "Fix a stupid NPE"

core/java/android/net/NetworkAgent.java

diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java
index c42dacc..e9bcefe 100644
--- a/core/java/android/net/NetworkAgent.java
+++ b/core/java/android/net/NetworkAgent.java
@@ -556,12 +556,12 @@
     @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,