Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle null NetworkState updates"

Browse Source 
am: ae758b2c7f

Change-Id: I9d8d5c176804344a40f6646acf65d2d8a5cd976f
This commit is contained in:
Erik Kline
2017-03-07 06:31:48 +00:00
committed by android-build-merger
parent e0a62a4398 ae758b2c7f
commit 4cf8f7a8cd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/connectivity/Tethering.java
View File

@@ -1206,7 +1206,8 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
protected void handleNewUpstreamNetworkState(NetworkState ns) { protected void handleNewUpstreamNetworkState(NetworkState ns) {
mIPv6TetheringCoordinator.updateUpstreamNetworkState(ns); mIPv6TetheringCoordinator.updateUpstreamNetworkState(ns);
mOffloadController.setUpstreamLinkProperties(ns.linkProperties); mOffloadController.setUpstreamLinkProperties(
(ns != null) ? ns.linkProperties : null);
} }
} }