diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-06-16 21:34:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-16 21:34:27 +0000 |
| commit | f4c936a7e627fa2a11ebfaa2614a76f3c69a4756 (patch) | |
| tree | f1aad64577e94cdb59d6a3335a81e14a7f955a3a | |
| parent | 8edfe18c193e2d6d719b2e141628f33b669598d9 (diff) | |
| parent | 505d62dd05fab80e5833e90954f832bcfaf535ef (diff) | |
| download | frameworks_base-f4c936a7e627fa2a11ebfaa2614a76f3c69a4756.zip frameworks_base-f4c936a7e627fa2a11ebfaa2614a76f3c69a4756.tar.gz frameworks_base-f4c936a7e627fa2a11ebfaa2614a76f3c69a4756.tar.bz2 | |
Merge "Fix to only do pre boot receivers on upgrade." into mnc-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index b262442..667abb6 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -11495,7 +11495,7 @@ public final class ActivityManagerService extends ActivityManagerNative for (int i=0; i<ris.size(); i++) { ActivityInfo ai = ris.get(i).activityInfo; ComponentName comp = new ComponentName(ai.packageName, ai.name); - if (false && lastDoneReceivers.contains(comp)) { + 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); |