Merge "Add initial connectivity metrics handling." into nyc-dev
This commit is contained in:
@@ -71,6 +71,7 @@ import android.net.ProxyInfo;
|
|||||||
import android.net.RouteInfo;
|
import android.net.RouteInfo;
|
||||||
import android.net.UidRange;
|
import android.net.UidRange;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
|
import android.net.metrics.ConnectivityServiceChangeEvent;
|
||||||
import android.os.Binder;
|
import android.os.Binder;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
@@ -4511,6 +4512,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
|
|||||||
|
|
||||||
private void makeDefault(NetworkAgentInfo newNetwork) {
|
private void makeDefault(NetworkAgentInfo newNetwork) {
|
||||||
if (DBG) log("Switching to new default network: " + newNetwork);
|
if (DBG) log("Switching to new default network: " + newNetwork);
|
||||||
|
ConnectivityServiceChangeEvent.logEvent(newNetwork.network.netId);
|
||||||
setupDataActivityTracking(newNetwork);
|
setupDataActivityTracking(newNetwork);
|
||||||
try {
|
try {
|
||||||
mNetd.setDefaultNetId(newNetwork.network.netId);
|
mNetd.setDefaultNetId(newNetwork.network.netId);
|
||||||
@@ -5141,5 +5143,4 @@ public class ConnectivityService extends IConnectivityManager.Stub
|
|||||||
NetworkAgentInfo nai, NetworkRequest defaultRequest) {
|
NetworkAgentInfo nai, NetworkRequest defaultRequest) {
|
||||||
return new NetworkMonitor(context, handler, nai, defaultRequest);
|
return new NetworkMonitor(context, handler, nai, defaultRequest);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user