diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-05 12:36:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-05 12:36:04 -0700 |
| commit | ec098efcb11c4f4a12e7d3e44995536ef1eb7c1b (patch) | |
| tree | 2bac4d13e270d27c1695f55b00b7ca51b50fa194 /services/java | |
| parent | f389f2820c731b2b938a7057cde9dc11d87bcbe3 (diff) | |
| parent | 342c6bc8e5edb5a0cfa2ad65162d559b7f2ad993 (diff) | |
| download | frameworks_base-ec098efcb11c4f4a12e7d3e44995536ef1eb7c1b.zip frameworks_base-ec098efcb11c4f4a12e7d3e44995536ef1eb7c1b.tar.gz frameworks_base-ec098efcb11c4f4a12e7d3e44995536ef1eb7c1b.tar.bz2 | |
am 342c6bc8: am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client"
* commit '342c6bc8e5edb5a0cfa2ad65162d559b7f2ad993':
Am: Clean mLaunchingProviders of all providers started by the client
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index e670da0..614b93a 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -10621,7 +10621,9 @@ public final class ActivityManagerService extends ActivityManagerNative restart = true; } else { removeDyingProviderLocked(app, cpr, true); + // cpr should have been removed from mLaunchingProviders NL = mLaunchingProviders.size(); + i--; } } } |