Merge "Battery monitoring fixes:" am: 511d573149

Original change: undetermined

Change-Id: I80255a49b80cc2d4c890835c6250f3e45356e55c
This commit is contained in:
Dianne Hackborn
2021-05-31 07:38:50 +00:00
committed by Automerger Merge Worker

View File

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