From a33f1a2f82f734ceaa1db4b9bfab60c919fb824f Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Thu, 15 Jun 2017 14:33:16 -0700 Subject: [PATCH] Fix issue #62524613: Background limitation is not working as expected... ...for most background services. Whoops, was only stopping the first service it found! Test: bit CtsAppTestCases:ActivityManagerProcessStateTest Change-Id: I42af2872afed8b49fab0f53eff36b62e55d23409 --- .../com/android/server/am/ActiveServices.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index c41748424b105..a9a41fb9b9486 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -622,19 +622,19 @@ public final class ActiveServices { != ActivityManager.APP_START_MODE_NORMAL) { if (stopping == null) { stopping = new ArrayList<>(); - String compName = service.name.flattenToShortString(); - EventLogTags.writeAmStopIdleService(service.appInfo.uid, compName); - StringBuilder sb = new StringBuilder(64); - sb.append("Stopping service due to app idle: "); - UserHandle.formatUid(sb, service.appInfo.uid); - sb.append(" "); - TimeUtils.formatDuration(service.createTime - - SystemClock.elapsedRealtime(), sb); - sb.append(" "); - sb.append(compName); - Slog.w(TAG, sb.toString()); - stopping.add(service); } + String compName = service.name.flattenToShortString(); + EventLogTags.writeAmStopIdleService(service.appInfo.uid, compName); + StringBuilder sb = new StringBuilder(64); + sb.append("Stopping service due to app idle: "); + UserHandle.formatUid(sb, service.appInfo.uid); + sb.append(" "); + TimeUtils.formatDuration(service.createTime + - SystemClock.elapsedRealtime(), sb); + sb.append(" "); + sb.append(compName); + Slog.w(TAG, sb.toString()); + stopping.add(service); } } }