net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java - Issue 2003503003: Add a null check in ConnectivityManagerDelegate.getNetworkState

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: net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java

Issue 2003503003: Add a null check in ConnectivityManagerDelegate.getNetworkState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments Created 4 years, 7 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

Index: net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java

diff --git a/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java b/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java

index ba58a1cd6d59d12250bb49f3f37851736d5aface..470c2a434b15fa8c0a96ecfa2cbfff5045b1e32a 100644

--- a/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java

+++ b/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java

@@ -94,7 +94,7 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

@TargetApi(Build.VERSION_CODES.LOLLIPOP)

NetworkState getNetworkState(Network network) {

final NetworkInfo networkInfo = mConnectivityManager.getNetworkInfo(network);

- if (networkInfo.getType() == TYPE_VPN) {

+ if (networkInfo != null && networkInfo.getType() == TYPE_VPN) {

// When a VPN is in place the underlying network type can be queried via

// getActiveNeworkInfo() thanks to

// https://android.googlesource.com/platform/frameworks/base/+/d6a7980d

« no previous file with comments | « no previous file | net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java » ('j') | no next file with comments »