chromeos/network/network_connection_handler.cc - Issue 22950007: Insufficient information on activation details should be handled correctly.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/network/network_connection_handler.cc

Issue 22950007: Insufficient information on activation details should be handled correctly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc ('K') | « chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/network/network_connection_handler.cc

diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc

index afbd741d1202660ef8db97d32b954017d066f9d0..407a6581f2bc48052d1cbf3deea1473f6be58ac5 100644

--- a/chromeos/network/network_connection_handler.cc

+++ b/chromeos/network/network_connection_handler.cc

@@ -57,8 +57,9 @@ void CopyStringFromDictionary(const base::DictionaryValue& source,

bool NetworkRequiresActivation(const NetworkState* network) {

return (network->type() == flimflam::kTypeCellular &&

- (network->activation_state() != flimflam::kActivationStateActivated ||

- network->cellular_out_of_credits()));

+ ((network->activation_state() != flimflam::kActivationStateActivated &&

+ network->activation_state() != flimflam::kActivationStateUnknown) ||

+ network->cellular_out_of_credits()));

}

bool VPNIsConfigured(const std::string& service_path,