am c71c901a: am 278fa87c: am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev

* commit 'c71c901ad4d33a373efdad4cf97d12f8ca77e089':
  Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
This commit is contained in:
Dianne Hackborn
2014-03-07 01:35:32 +00:00
committed by Android Git Automerger

View File

@@ -9141,8 +9141,13 @@ public final class ActivityManagerService extends ActivityManagerNative
ActivityInfo ai = ris.get(i).activityInfo;
ComponentName comp = new ComponentName(ai.packageName, ai.name);
if (lastDoneReceivers.contains(comp)) {
// We already did the pre boot receiver for this app with the current
// platform version, so don't do it again...
ris.remove(i);
i--;
// ...however, do keep it as one that has been done, so we don't
// forget about it when rewriting the file of last done receivers.
doneReceivers.add(comp);
}
}