diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-08-20 08:57:35 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-08-20 08:57:35 +0000 |
commit | afd21f5a7ff944b9e3e7c0a90682f86feacc9eaa (patch) | |
tree | 8fba24f518735694b8535019cf09c6471c6815ba /java | |
parent | 19b7709da6d2adc3c70132877ca835f5495c4067 (diff) | |
parent | 456339b760ad258f3924f2afd403da485424204b (diff) | |
download | ethernet-afd21f5a7ff944b9e3e7c0a90682f86feacc9eaa.tar.gz |
Merge "prevent nullptr dereference when calling unwanted"android-s-beta-5android-s-beta-5
Diffstat (limited to 'java')
-rw-r--r-- | java/com/android/server/ethernet/EthernetNetworkFactory.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java index 32dbd7e..cd086e7 100644 --- a/java/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/java/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(); |