am cfe01d29: am e52a2ea0: am f91526ce: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev

* commit 'cfe01d29913836d14dc762f0a8d1193b7626010e':
  Fix issue #17323751: Additional items in aggregated battery stats
This commit is contained in:
Dianne Hackborn
2014-12-09 00:59:01 +00:00
committed by Android Git Automerger

View File

@@ -1544,6 +1544,17 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
final long ident = Binder.clearCallingIdentity(); final long ident = Binder.clearCallingIdentity();
if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intent.getAction())) {
final IBatteryStats bs = BatteryStatsService.getService();
try {
NetworkInfo ni = intent.getParcelableExtra(
ConnectivityManager.EXTRA_NETWORK_INFO);
bs.noteConnectivityChanged(intent.getIntExtra(
ConnectivityManager.EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_NONE),
ni != null ? ni.getState().toString() : "?");
} catch (RemoteException e) {
}
}
try { try {
mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL); mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
} finally { } finally {