Merge "Fix issue #62524613: Background limitation is not working as expected..." into oc-dev am: 2b20d552bd

am: 216bd4fa6f

Change-Id: I52b8db57081d12f1b13f5a6568cd6f3e660dc39b
This commit is contained in:
Dianne Hackborn
2017-06-16 01:08:08 +00:00
committed by android-build-merger

View File

@@ -626,6 +626,7 @@ public final class ActiveServices {
!= ActivityManager.APP_START_MODE_NORMAL) { != ActivityManager.APP_START_MODE_NORMAL) {
if (stopping == null) { if (stopping == null) {
stopping = new ArrayList<>(); stopping = new ArrayList<>();
}
String compName = service.name.flattenToShortString(); String compName = service.name.flattenToShortString();
EventLogTags.writeAmStopIdleService(service.appInfo.uid, compName); EventLogTags.writeAmStopIdleService(service.appInfo.uid, compName);
StringBuilder sb = new StringBuilder(64); StringBuilder sb = new StringBuilder(64);
@@ -641,7 +642,6 @@ public final class ActiveServices {
} }
} }
} }
}
if (stopping != null) { if (stopping != null) {
for (int i=stopping.size()-1; i>=0; i--) { for (int i=stopping.size()-1; i>=0; i--) {
ServiceRecord service = stopping.get(i); ServiceRecord service = stopping.get(i);