commit d6567e550849b1557a95cba6addc70029c2584bf
author Patrick Rohr <prohr@google.com> Thu Jul 20 19:10:02 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 20 19:10:02 2023 +0000
tree 5418c3e040fe8c983a2ba09540d72ce3087697c7
parent 001e14cb04eeb0f9525444936fa13ba47cc08585
parent df50b6caacdb04612d2bea2c919b55c04fdd693b

ethernet: add null check before reporting server interface state am: df50b6caac

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2667458

Change-Id: I79b0c386cd6e634528b5582467fdfd15724ef43a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/service-t/src/com/android/server/ethernet/EthernetTracker.java b/service-t/src/com/android/server/ethernet/EthernetTracker.java
index 1f22b02..8141350 100644
--- a/service-t/src/com/android/server/ethernet/EthernetTracker.java
+++ b/service-t/src/com/android/server/ethernet/EthernetTracker.java
@@ -431,7 +431,7 @@
             for (String iface : getClientModeInterfaces(canUseRestrictedNetworks)) {
                 unicastInterfaceStateChange(listener, iface);
             }
-            if (mTetheringInterfaceMode == INTERFACE_MODE_SERVER) {
+            if (mTetheringInterface != null && mTetheringInterfaceMode == INTERFACE_MODE_SERVER) {
                 unicastInterfaceStateChange(listener, mTetheringInterface);
             }