Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use correct timebase in fg service notifications." into oc-dev

Browse Source
This commit is contained in:
Daniel Sandler
2017-06-07 14:56:41 +00:00
committed by Android (Google) Code Review
parent 7925f817d0 886e01636e
commit 630e7841e5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -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)