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

Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570

Browse Source 
Change-Id: I174ea95f65bce63043fb3fbe9f4d5a0839ae566e
This commit is contained in:
Chalard Jean
2020-04-07 09:35:22 +00:00
committed by Automerger Merge Worker
parent c5a8d8cb4a 50756739b5
commit 8433247d74
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,