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

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

Change-Id: I7d54b1e0f6e092a15364c9e7ad0e94f31682acfe

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

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