Merge "Last-ditch clamping of negative NetworkStats." into pi-dev
am: 4625faa2f2
Change-Id: I0db4e16533aeac3aa88307a0af0b64cb6041d2c0
diff --git a/services/core/java/com/android/server/net/NetworkStatsService.java b/services/core/java/com/android/server/net/NetworkStatsService.java
index addc479..aba75dd 100644
--- a/services/core/java/com/android/server/net/NetworkStatsService.java
+++ b/services/core/java/com/android/server/net/NetworkStatsService.java
@@ -160,8 +160,7 @@
static final boolean LOGV = Log.isLoggable(TAG, Log.VERBOSE);
private static final int MSG_PERFORM_POLL = 1;
- private static final int MSG_UPDATE_IFACES = 2;
- private static final int MSG_REGISTER_GLOBAL_ALERT = 3;
+ private static final int MSG_REGISTER_GLOBAL_ALERT = 2;
/** Flags to control detail level of poll event. */
private static final int FLAG_PERSIST_NETWORK = 0x1;
@@ -1673,10 +1672,6 @@
mService.performPoll(flags);
return true;
}
- case MSG_UPDATE_IFACES: {
- mService.updateIfaces(null);
- return true;
- }
case MSG_REGISTER_GLOBAL_ALERT: {
mService.registerGlobalAlert();
return true;