commit fec561527ebd9a5d51c9d7c3f3433942f6ec9643
author Dan Sandler <dsandler@android.com> Tue Jun 06 14:23:43 2017 -0400
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jun 08 00:26:49 2017 +0000
tree 7ca65e31469ae6c896c7fad31d8d0cae08d03fab
parent 154a9d0a5fcd2dcb85120c776ffccb775ba952d2

Use correct timebase in fg service notifications.

Bug: 36891897
Test: math
Change-Id: If0b922b620ca1b21e10b7fa988f5b3fd5c6a9c29
(cherry picked from commit 886e01636eacce22bf2f3c7436e1d865b576b6aa)

services/core/java/com/android/server/am/ActiveServices.java

diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index bad7091..c417484 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 @@
             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 @@
                             .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)