commit ae758b2c7f7fc5e417757d60da1fbe7f38d1316c
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 07 06:24:16 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 07 06:24:17 2017 +0000
tree da4666857061897d44ba11067ed7951e5b9d1bc1
parent affbb8b6a9de8fb0839e04786827fad3dc17101f
parent 34baa3da4e1f422cc1d7684dcd92bcb8381a7140

Merge "Handle null NetworkState updates"

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

diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
index 015212f..dfd647c 100644
--- a/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@ -1206,7 +1206,8 @@
 
             protected void handleNewUpstreamNetworkState(NetworkState ns) {
                 mIPv6TetheringCoordinator.updateUpstreamNetworkState(ns);
-                mOffloadController.setUpstreamLinkProperties(ns.linkProperties);
+                mOffloadController.setUpstreamLinkProperties(
+                        (ns != null) ? ns.linkProperties : null);
             }
         }