Merge "Handle null NetworkState updates" am: ae758b2c7f

am: 4cf8f7a8cd Change-Id: I47cdb040baed8c4c700ff7412a01d79f8edccbd2
2017-03-07 06:36:13 +00:00
parent 3765538bab 4cf8f7a8cd
commit b48eb4f71a
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);
            }
        }