summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@android.com>2012-08-27 12:31:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-27 12:31:49 -0700
commit4763989d95342c25e9b857dc9ee21eb5ebac31d6 (patch)
treefcb0800762d3a044d9fa08826c4f14ee01a94eac /core/java
parent26ad1e7874f3151ec331e142fdcb8b3a22ddc26a (diff)
parent32d1fec50baaecdea34ae2a47ca808e8e4181ed2 (diff)
downloadframeworks_base-4763989d95342c25e9b857dc9ee21eb5ebac31d6.zip
frameworks_base-4763989d95342c25e9b857dc9ee21eb5ebac31d6.tar.gz
frameworks_base-4763989d95342c25e9b857dc9ee21eb5ebac31d6.tar.bz2
am 32d1fec5: Merge "Fixes relative time formatting issue for dates in future"
* commit '32d1fec50baaecdea34ae2a47ca808e8e4181ed2': Fixes relative time formatting issue for dates in future
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/text/format/DateUtils.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java
index da10311..211453d 100644
--- a/core/java/android/text/format/DateUtils.java
+++ b/core/java/android/text/format/DateUtils.java
@@ -1618,7 +1618,7 @@ public class DateUtils
String result;
long now = System.currentTimeMillis();
- long span = now - millis;
+ long span = Math.abs(now - millis);
synchronized (DateUtils.class) {
if (sNowTime == null) {