diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-03-15 10:56:16 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-03-15 10:56:16 -0700 |
| commit | b37f7e59ee38472bdd3ca5fe66cc847890c862e2 (patch) | |
| tree | 11c000d166a5e0f2cbabd12939b3bc3cb0e1659d /core/java/android/app | |
| parent | 2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d (diff) | |
| parent | 6fe725ee5d943faaaa7ae9899b8613c90159d2dd (diff) | |
| download | frameworks_base-b37f7e59ee38472bdd3ca5fe66cc847890c862e2.zip frameworks_base-b37f7e59ee38472bdd3ca5fe66cc847890c862e2.tar.gz frameworks_base-b37f7e59ee38472bdd3ca5fe66cc847890c862e2.tar.bz2 | |
Merge changes I81fc2f90,I5e7fd759
* changes:
Using proper key for removing from map.
Removing wrong equals method in comparator.
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/LocalActivityManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/LocalActivityManager.java b/core/java/android/app/LocalActivityManager.java index a24fcae..7845e03 100644 --- a/core/java/android/app/LocalActivityManager.java +++ b/core/java/android/app/LocalActivityManager.java @@ -380,7 +380,7 @@ public class LocalActivityManager { if (r != null) { win = performDestroy(r, finish); if (finish) { - mActivities.remove(r); + mActivities.remove(id); } } return win; |