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

This commit is contained in:
Jeff Sharkey
2017-12-05 00:58:46 +00:00
committed by Gerrit Code Review

View File

@@ -951,7 +951,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);