OSDN Git Service

[NetworkPolicy]: Fixes the crash issues caused by null pointer.
authorzhangshuxiao <zhangshuxiao@xiaomi.com>
Tue, 9 Aug 2016 10:48:04 +0000 (18:48 +0800)
committerShuxiao Zhang <zhangshuxiao@xiaomi.com>
Wed, 10 Aug 2016 03:49:54 +0000 (03:49 +0000)
When handleRegisterNetworkAgent in ConnectivityService,
the networkinfo of NetworkAgentInfo will be set to null.
So we need to handle the null pointer of state.networkInfo.

Change-Id: I2a278f1f1b2455057fd2ed323ff4df340c3cbca9
Signed-off-by: zhangshuxiao <zhangshuxiao@xiaomi.com>
services/core/java/com/android/server/net/NetworkPolicyManagerService.java

index aff87ff..0dba0d7 100644 (file)
@@ -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();