Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1d0c089 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Handle null NetworkState updates" am: ae758b2c am: 4cf8f7a8 

am: b48eb4f7

Change-Id: Idd5cf1b8de35cca3a7518d6ed76d87044c8846b4
parents 6bbefcbf b48eb4f7

services/core/java/com/android/server/connectivity/Tethering.java

+2 −1
Original line number Diff line number Diff line
@@ -1208,7 +1208,8 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering 


            protected void handleNewUpstreamNetworkState(NetworkState ns) {

                mIPv6TetheringCoordinator.updateUpstreamNetworkState(ns);

                mOffloadController.setUpstreamLinkProperties(ns.linkProperties);

                mOffloadController.setUpstreamLinkProperties(

                        (ns != null) ? ns.linkProperties : null);

            }

        }