LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Match network roaming state to avoid wtf()." am: cd797a5069 am: 5f948c9bc1

Browse Source 
am: 6e46b3bba8

Change-Id: I04247a01f6a93001079429b1ee40f28afc877dcd
This commit is contained in:
Jeff Sharkey
2017-12-05 01:38:22 +00:00
committed by android-build-merger
parent 41dd9c894c 6e46b3bba8
commit 0e39b85de9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -972,7 +972,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
getNetworkTypeName(networkType), ""); getNetworkTypeName(networkType), "");
info.setDetailedState(NetworkInfo.DetailedState.DISCONNECTED, null, null); info.setDetailedState(NetworkInfo.DetailedState.DISCONNECTED, null, null);
info.setIsAvailable(true); info.setIsAvailable(true);
state = new NetworkState(info, new LinkProperties(), new NetworkCapabilities(), final NetworkCapabilities capabilities = new NetworkCapabilities();
capabilities.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING,
!info.isRoaming());
state = new NetworkState(info, new LinkProperties(), capabilities,
null, null, null); null, null, null);
} }
filterNetworkStateForUid(state, uid, ignoreBlocked); filterNetworkStateForUid(state, uid, ignoreBlocked);