Remove uses of Time. am: 909a0763c6 am: 8edea90f7f am: e565640312

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2149693

Change-Id: Ia4c0e40432cbadc01f791465dd7acbe65bcd0ddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Almaz Mingaleev
2022-07-13 09:36:27 +00:00
committed by Automerger Merge Worker
+10 -12
View File
@@ -18,13 +18,16 @@ package com.android.messaging.util;
import android.content.Context; import android.content.Context;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.text.format.Time;
import com.android.messaging.Factory; import com.android.messaging.Factory;
import com.android.messaging.R; import com.android.messaging.R;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.time.ZoneId;
import java.util.Date; import java.util.Date;
import java.util.Locale; import java.util.Locale;
@@ -265,16 +268,11 @@ public class Dates {
return String.format(format, count); return String.format(format, count);
} }
private static synchronized long getNumberOfDaysPassed(final long date1, final long date2) { private static long getNumberOfDaysPassed(final long date1, final long date2) {
if (sThenTime == null) { LocalDateTime dateTime1 = LocalDateTime.ofInstant(Instant.ofEpochMilli(date1),
sThenTime = new Time(); ZoneId.systemDefault());
} LocalDateTime dateTime2 = LocalDateTime.ofInstant(Instant.ofEpochMilli(date2),
sThenTime.set(date1); ZoneId.systemDefault());
final int day1 = Time.getJulianDay(date1, sThenTime.gmtoff); return Math.abs(ChronoUnit.DAYS.between(dateTime2, dateTime1));
sThenTime.set(date2);
final int day2 = Time.getJulianDay(date2, sThenTime.gmtoff);
return Math.abs(day2 - day1);
} }
private static Time sThenTime;
} }