LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a stupid NPE

Browse Source 
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: I3e17211c03bc74426bf5e2e414ec322d73b0060b
This commit is contained in:
Chalard Jean
2020-04-03 07:12:43 +09:00
parent 9122e56202
commit 380318053b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/NetworkAgent.java
View File

@@ -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,