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

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

Merge "Handle null NetworkState updates" am: ae758b2c 

am: 4cf8f7a8

Change-Id: I47cdb040baed8c4c700ff7412a01d79f8edccbd2
parents 3765538b 4cf8f7a8

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

+2 −1
Original line number Diff line number Diff line
@@ -1206,7 +1206,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);

            }

        }