Merge "Battery monitoring fixes:"

This commit is contained in:
Dianne Hackborn
2014-05-22 17:22:15 +00:00
committed by Android (Google) Code Review

View File

@@ -5709,10 +5709,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
// updateNetworkSettings(); // updateNetworkSettings();
} }
// notify battery stats service about this network // notify battery stats service about this network
// try { try {
// TODO BatteryStatsService.getService().noteNetworkInterfaceType(
//BatteryStatsService.getService().noteNetworkInterfaceType(iface, netType); newNetwork.linkProperties.getInterfaceName(),
// } catch (RemoteException e) { } newNetwork.networkInfo.getType());
} catch (RemoteException e) { }
notifyNetworkCallbacks(newNetwork, ConnectivityManager.CALLBACK_AVAILABLE); notifyNetworkCallbacks(newNetwork, ConnectivityManager.CALLBACK_AVAILABLE);
} else { } else {
if (DBG && newNetwork.networkRequests.size() != 0) { if (DBG && newNetwork.networkRequests.size() != 0) {