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

Merge "prevent nullptr dereference when calling unwanted" am: 03f03d7acf am: 07060e39fd

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1802269

Change-Id: Ica7a0ee1ae2d2c977fcc6caac3b53e157ff61281
This commit is contained in:
Treehugger Robot
2021-08-20 09:25:55 +00:00
committed by Automerger Merge Worker
parent 6ef870281f 07060e39fd
commit cc1a711197
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
View File

@@ -506,12 +506,15 @@ public class EthernetNetworkFactory extends NetworkFactory {
mNetworkFactory.getProvider(), new EthernetNetworkAgent.Callbacks() { mNetworkFactory.getProvider(), new EthernetNetworkAgent.Callbacks() {
@Override @Override
public void onNetworkUnwanted() { public void onNetworkUnwanted() {
// if mNetworkAgent is null, we have already called stop.
if (mNetworkAgent == null) return;
if (this == mNetworkAgent.getCallbacks()) { if (this == mNetworkAgent.getCallbacks()) {
stop(); stop();
} else if (mNetworkAgent != null) { } else {
Log.d(TAG, "Ignoring unwanted as we have a more modern " + Log.d(TAG, "Ignoring unwanted as we have a more modern " +
"instance"); "instance");
} // Otherwise, we've already called stop. }
} }
}); });
mNetworkAgent.register(); mNetworkAgent.register();