diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-04-07 05:53:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-04-07 05:53:10 +0000 |
| commit | 72746119bc08d53facd433a00d2b33492fa4fb9e (patch) | |
| tree | 99a55d28c3558d0df1b73d27d8a0fe031caeaac7 /core/java | |
| parent | 32c3f23f37d7c12cf0701901aa154e7a868782f8 (diff) | |
| parent | 1c48f85a211e5c1ff72b6388e4ef39fdb5f8f789 (diff) | |
Merge "Fix a stupid NPE"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/NetworkAgent.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java index c42dacc187a9..e9bcefef50c7 100644 --- a/core/java/android/net/NetworkAgent.java +++ b/core/java/android/net/NetworkAgent.java @@ -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, |