summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Greenwalt <rgreenwalt@google.com> 2016-08-10 21:07:25 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-08-10 21:07:26 +0000
commit2438a33e5488675552ad99987c015d17ca0c4d92 (patch)
tree3d3b797ef02ba13ed6d78430040ccc0782ebcc2b
parent5b63231a31dbeafc0dfb260b2ebc52f536dc3441 (diff)
parentbad369d63e975b7360693cebd1728765ddc7b924 (diff)
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer."
-rw-r--r--services/core/java/com/android/server/net/NetworkPolicyManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index aff87ff49ca5..0dba0d780cb5 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -1206,7 +1206,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
final ArrayList<Pair<String, NetworkIdentity>> connIdents = new ArrayList<>(states.length);
final ArraySet<String> connIfaces = new ArraySet<String>(states.length);
for (NetworkState state : states) {
- if (state.networkInfo.isConnected()) {
+ if (state.networkInfo != null && state.networkInfo.isConnected()) {
final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, state);
final String baseIface = state.linkProperties.getInterfaceName();