Merge "prevent nullptr dereference when calling unwanted"

2021-08-20 08:57:35 +00:00
parent c57eb8c6ad 4cf6809d75
commit 03f03d7acf
1 changed files with 5 additions and 2 deletions
--- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/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();