commit f91526cec0df8b871c91ca832f6322a362ba3228
author Dianne Hackborn <hackbod@google.com> Fri Dec 05 22:54:07 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 05 22:54:08 2014 +0000
tree 8afdb9e5133f7af9e4d397c125c57c2e7ba30279
parent c1529548aaae68d2e1d5558dd7f490f81a76d958
parent 37e2d0e06877d4aa2c2df820142aac0072397f26

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

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 348aa1b..179174e 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1544,6 +1544,17 @@
             }
 
             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 {
                 mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
             } finally {