joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Match network roaming state to avoid wtf()."

Browse source 
am: 32e8144344

Change-Id: I6796d37e4458ef4da16d16f4c0f2bdd495007515
This commit is contained in:
Jeff Sharkey 2017-12-05 01:11:53 +00:00 • committed by android-build-merger
commit a5d7f82fec
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

@ -949,7 +949,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
getNetworkTypeName(networkType), "");
info.setDetailedState(NetworkInfo.DetailedState.DISCONNECTED, null, null);
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);
}
filterNetworkStateForUid(state, uid, ignoreBlocked);