Merge "Handle null NetworkState updates"

am: ae758b2c7f Change-Id: I9d8d5c176804344a40f6646acf65d2d8a5cd976f
2017-03-07 06:31:48 +00:00
parent e0a62a4398 ae758b2c7f
commit 4cf8f7a8cd
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@ -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);
            }
        }