Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 48e9a0dd: Merge change Ice5e9209 into eclair

Browse Source 
Merge commit '48e9a0dd66b832cfaf668deba584394eba0ffdfc' into eclair-plus-aosp

* commit '48e9a0dd66b832cfaf668deba584394eba0ffdfc':
  Fix issue #2150258: Suggestions become inactive and do not respond when pressed.
This commit is contained in:
Dianne Hackborn
2009-09-30 16:24:01 -07:00
committed by Android Git Automerger
parent 05c776477c 48e9a0dd66
commit 8f4f41df55
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -2252,7 +2252,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
mHandler.sendMessage(msg); mHandler.sendMessage(msg);
} }
reportResumedActivity(next); reportResumedActivityLocked(next);
next.thumbnail = null; next.thumbnail = null;
setFocusedActivityLocked(next); 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); //Log.i(TAG, "**** REPORT RESUME: " + r);
final int identHash = System.identityHashCode(r); final int identHash = System.identityHashCode(r);
@@ -12815,6 +12815,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
if (andResume) { if (andResume) {
r.results = null; r.results = null;
r.newIntents = null; r.newIntents = null;
reportResumedActivityLocked(r);
} }
return true; return true;