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

Merge "Fix a stupid NPE" am: 30673a9684 am: fb3e94c8d8 am: 2e99fd04fe

Browse Source 
Change-Id: Ib5fa0c4ae1c73094bbe08468170c96d4dc0692a5
This commit is contained in:
Treehugger Robot
2020-04-07 06:32:14 +00:00
committed by Automerger Merge Worker
parent 9df7265126 2e99fd04fe
commit 9762007659
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
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,