commit a8bd650e810178358251e3099f949af8422d5a24
author Jeff Sharkey <jsharkey@google.com> Tue Oct 20 17:32:47 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 20 17:32:47 2015 +0000
tree b5cb7fba9cd696dae2eb3fb3d572f18f1a1941d0
parent 6bdaffa2af987725f54cae246b5ed694720213bb
parent 29b0ea2dbf8f0a31d02af8a4ce17753c9499b167

Merge "Clamp large data usage values." into mnc-dr-dev
am: 29b0ea2dbf

* commit '29b0ea2dbf8f0a31d02af8a4ce17753c9499b167':
  Clamp large data usage values.

src/com/android/settings/widget/ChartDataUsageView.java

diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java
index cc9acd6..6fb805b 100644
--- a/src/com/android/settings/widget/ChartDataUsageView.java
+++ b/src/com/android/settings/widget/ChartDataUsageView.java
@@ -22,6 +22,7 @@
 import android.content.res.Resources;
 import android.net.NetworkPolicy;
 import android.net.NetworkStatsHistory;
+import android.net.TrafficStats;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Spannable;
@@ -33,6 +34,7 @@
 import android.text.format.Time;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.util.MathUtils;
 import android.view.MotionEvent;
 import android.view.View;
 
@@ -535,6 +537,7 @@
 
         @Override
         public long buildLabel(Resources res, SpannableStringBuilder builder, long value) {
+            value = MathUtils.constrain(value, 0, TrafficStats.TB_IN_BYTES);
             final BytesResult result = Formatter.formatBytes(res, value,
                     Formatter.FLAG_SHORTER | Formatter.FLAG_CALCULATE_ROUNDED);
             setText(builder, sSpanSize, result.value, "^1");