From 886e01636eacce22bf2f3c7436e1d865b576b6aa Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Tue, 6 Jun 2017 14:23:43 -0400
Subject: [PATCH] Use correct timebase in fg service notifications.

Bug: 36891897
Test: math
Change-Id: If0b922b620ca1b21e10b7fa988f5b3fd5c6a9c29
---
 .../core/java/com/android/server/am/ActiveServices.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index bad7091429a27..c41748424b105 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -813,7 +813,8 @@ public final class ActiveServices {
             String title;
             String msg;
             String[] pkgs;
-            long oldestStartTime = System.currentTimeMillis(); // now
+            final long nowElapsed = SystemClock.elapsedRealtime();
+            long oldestStartTime = nowElapsed;
             if (active.size() == 1) {
                 intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
                 intent.setData(Uri.fromParts("package", active.get(0).mPackageName, null));
@@ -846,8 +847,8 @@ public final class ActiveServices {
                             .addExtras(notificationBundle)
                             .setSmallIcon(R.drawable.stat_sys_vitals)
                             .setOngoing(true)
-                            .setShowWhen(oldestStartTime > 0)
-                            .setWhen(oldestStartTime)
+                            .setShowWhen(oldestStartTime < nowElapsed)
+                            .setWhen(System.currentTimeMillis() - (nowElapsed - oldestStartTime))
                             .setColor(context.getColor(
                                     com.android.internal.R.color.system_notification_accent_color))
                             .setContentTitle(title)