diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-04-07 06:59:06 +0000 |
|---|---|---|
| committer | Chalard Jean <jchalard@google.com> | 2020-04-07 07:29:10 +0000 |
| commit | b2f183cd6ea2ac516d0dad59ca457aec4176424c (patch) | |
| tree | 93d1cf7c64845e4900615b78d34ef81dc04b5de0 /core/java/android | |
| parent | b02f8ff74f6f0984964f87a740b6585e135bc645 (diff) | |
Fix a stupid NPE
Okay so this is really not a behavior change as it converts an
NPE into an illegal argument exception, but still, that's what
should happen (and that's what the upcoming test actually tests
for).
Test: upcoming NetworkAgentTest
Bug: 139268426
Change-Id: I0d9b8cb8f8dcb587b9430b486b863efb9e9e77ef
Merged-In: I3e17211c03bc74426bf5e2e414ec322d73b0060b
(cherry picked from commit 827d7ceea1e83cca9ba3f6189e20b6780c0194ed, aosp/1277595)
Diffstat (limited to 'core/java/android')
| -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, |