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 
am: 630e7841e5

Change-Id: I3493f13c16b24d343f61e80d70f37cf62d6b8ee2
This commit is contained in:
Daniel Sandler
2017-06-07 15:02:00 +00:00
committed by android-build-merger
parent 805e32d19d 630e7841e5
commit 107bfc46c6
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 title;
String msg; String msg;
String[] pkgs; String[] pkgs;
long oldestStartTime = System.currentTimeMillis(); // now final long nowElapsed = SystemClock.elapsedRealtime();
long oldestStartTime = nowElapsed;
if (active.size() == 1) { if (active.size() == 1) {
intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
intent.setData(Uri.fromParts("package", active.get(0).mPackageName, null)); intent.setData(Uri.fromParts("package", active.get(0).mPackageName, null));
@@ -846,8 +847,8 @@ public final class ActiveServices {
.addExtras(notificationBundle) .addExtras(notificationBundle)
.setSmallIcon(R.drawable.stat_sys_vitals) .setSmallIcon(R.drawable.stat_sys_vitals)
.setOngoing(true) .setOngoing(true)
.setShowWhen(oldestStartTime > 0) .setShowWhen(oldestStartTime < nowElapsed)
.setWhen(oldestStartTime) .setWhen(System.currentTimeMillis() - (nowElapsed - oldestStartTime))
.setColor(context.getColor( .setColor(context.getColor(
com.android.internal.R.color.system_notification_accent_color)) com.android.internal.R.color.system_notification_accent_color))
.setContentTitle(title) .setContentTitle(title)