diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-30 18:47:45 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-30 18:47:45 -0400 |
commit | 48e9a0dd66b832cfaf668deba584394eba0ffdfc (patch) | |
tree | 80d3cf0aac293f3283375bd5c43bc929de346ecb /services | |
parent | 78128d721cdff2e035eab5da72819520f88affaf (diff) | |
parent | 1bcf5a8a61b53d846b094da583f1011b0024281e (diff) | |
download | frameworks_base-48e9a0dd66b832cfaf668deba584394eba0ffdfc.zip frameworks_base-48e9a0dd66b832cfaf668deba584394eba0ffdfc.tar.gz frameworks_base-48e9a0dd66b832cfaf668deba584394eba0ffdfc.tar.bz2 |
Merge change Ice5e9209 into eclair
* changes:
Fix issue #2150258: Suggestions become inactive and do not respond when pressed.
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 09792a1..a7deed6 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -2252,7 +2252,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen mHandler.sendMessage(msg); } - reportResumedActivity(next); + reportResumedActivityLocked(next); next.thumbnail = null; setFocusedActivityLocked(next); @@ -2525,7 +2525,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen } } - private void reportResumedActivity(HistoryRecord r) { + private void reportResumedActivityLocked(HistoryRecord r) { //Log.i(TAG, "**** REPORT RESUME: " + r); final int identHash = System.identityHashCode(r); @@ -12814,6 +12814,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen if (andResume) { r.results = null; r.newIntents = null; + reportResumedActivityLocked(r); } return true; |