diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-03-07 11:00:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 11:00:38 +0000 |
| commit | 72f456fc51ecd584c3b82f8f54020edd7b9a0f46 (patch) | |
| tree | 54187581857aa187afff81ebc37861608295a60a /services | |
| parent | 3a26ed5ab3ce04ff5556eb1fc7588a14672ee52c (diff) | |
| parent | a6590837a9d0211b4c44f25e1cbe2cd196aa1a3d (diff) | |
| download | frameworks_base-72f456fc51ecd584c3b82f8f54020edd7b9a0f46.zip frameworks_base-72f456fc51ecd584c3b82f8f54020edd7b9a0f46.tar.gz frameworks_base-72f456fc51ecd584c3b82f8f54020edd7b9a0f46.tar.bz2 | |
am a6590837: am 8b776e86: am c71c901a: am 278fa87c: am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
* commit 'a6590837a9d0211b4c44f25e1cbe2cd196aa1a3d':
Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 782868e..b23ab25 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -9212,8 +9212,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); } } |