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 changes Ic366b532,I0179b45b into nyc-dev

Browse source 
* changes:
  Move PinningNetworkCallback out to a new NetworkPinner class.
  Use MessageUtils in ConnectivityManager.
This commit is contained in:
Lorenzo Colitti 2016-03-02 04:18:02 +00:00 • committed by Android (Google) Code Review
commit fd38423bd4
1 changed files with 135 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/java/android/net/ConnectivityManager.java
View file

@ -45,10 +45,12 @@ import android.provider.Settings;
import android.telephony.SubscriptionManager;
import android.util.ArrayMap;
import android.util.Log;
import android.util.SparseArray;
import com.android.internal.telephony.ITelephony;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.util.Protocol;
import com.android.internal.util.MessageUtils;
import libcore.net.event.NetworkEventDispatcher;
@ -79,6 +81,13 @@ import java.util.concurrent.atomic.AtomicInteger;
public class ConnectivityManager {
private static final String TAG = "ConnectivityManager";
private static final SparseArray<String> sMagicDecoderRing = MessageUtils.findMessageNames(
new Class[]{ConnectivityManager.class}, new String[]{"CALLBACK_"});
private static final String whatToString(int what) {
return sMagicDecoderRing.get(what, Integer.toString(what));
}
/**
* A change in network connectivity has occurred. A default connection has either
* been established or lost. The NetworkInfo for the affected network is
@ -2581,9 +2590,11 @@ public class ConnectivityManager {
@Override
public void handleMessage(Message message) {
if (DBG) Log.d(TAG, "CM callback handler got msg " + message.what);
NetworkRequest request = (NetworkRequest) getObject(message, NetworkRequest.class);
Network network = (Network) getObject(message, Network.class);
if (DBG) {
Log.d(TAG, whatToString(message.what) + " for network " + network);
}
switch (message.what) {
case CALLBACK_PRECHECK: {
NetworkCallback callback = getCallback(request, "PRECHECK");