joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix null pointer exception of calling NetworkInfo.mState.name()"

Browse source
This commit is contained in:
Chalard Jean 2019-08-02 19:56:10 +00:00 • committed by Gerrit Code Review
commit 95d62d8e55
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
services/core/java/com/android/server/ConnectivityService.java
View file

@ -5519,7 +5519,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
nai.asyncChannel.connect(mContext, mTrackerHandler, nai.messenger);
NetworkInfo networkInfo = nai.networkInfo;
nai.networkInfo = null;
updateNetworkInfo(nai, networkInfo);
updateUids(nai, null, nai.networkCapabilities);
}
@ -6518,8 +6517,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (DBG) {
log(networkAgent.name() + " EVENT_NETWORK_INFO_CHANGED, going from " +
(oldInfo == null ? "null" : oldInfo.getState()) +
" to " + state);
oldInfo.getState() + " to " + state);
}
if (!networkAgent.created
@ -6592,8 +6590,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
// TODO(b/122649188): send the broadcast only to VPN users.
mProxyTracker.sendProxyBroadcast();
}
} else if ((oldInfo != null && oldInfo.getState() == NetworkInfo.State.SUSPENDED) ||
state == NetworkInfo.State.SUSPENDED) {
} else if (networkAgent.created && (oldInfo.getState() == NetworkInfo.State.SUSPENDED ||
state == NetworkInfo.State.SUSPENDED)) {
// going into or coming out of SUSPEND: re-score and notify
if (networkAgent.getCurrentScore() != oldScore) {
rematchAllNetworksAndRequests(networkAgent, oldScore);

3
services/core/java/com/android/server/connectivity/NetworkAgentInfo.java
View file

@ -16,6 +16,7 @@
package com.android.server.connectivity;
import android.annotation.NonNull;
import android.content.Context;
import android.net.IDnsResolver;
import android.net.INetd;
@ -116,7 +117,7 @@ import java.util.TreeSet;
// not, ConnectivityService disconnects the NetworkAgent's AsyncChannel.
public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> {
public NetworkInfo networkInfo;
@NonNull public NetworkInfo networkInfo;
// This Network object should always be used if possible, so as to encourage reuse of the
// enclosed socket factory and connection pool. Avoid creating other Network objects.
// This Network object is always valid.