diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-11 18:25:21 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-11 18:25:21 -0800 |
| commit | 474731d5efb30c1e9184f998610054747eb8e764 (patch) | |
| tree | 5881b5f7ea82fbf40a6087b361a8d27c1fb87aec /services | |
| parent | 62d4395bdb3114b9a75e46140456bc54fd13a3e7 (diff) | |
| parent | 871ecdce67fb59a2603c1b93db657fe8b65695bd (diff) | |
| download | frameworks_base-474731d5efb30c1e9184f998610054747eb8e764.zip frameworks_base-474731d5efb30c1e9184f998610054747eb8e764.tar.gz frameworks_base-474731d5efb30c1e9184f998610054747eb8e764.tar.bz2 | |
Merge change I2ffe306f into eclair
* changes:
Fix issue #2304284: contacts/dialer/recentcalls constantly flashing
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 3612a9b..f3cba69 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -12919,7 +12919,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen try { if (DEBUG_SWITCH) Log.i(TAG, "Switch is restarting resumed " + r); r.app.thread.scheduleRelaunchActivity(r, results, newIntents, - changes, !andResume); + changes, !andResume, mConfiguration); // Note: don't need to call pauseIfSleepingLocked() here, because // the caller will only pass in 'andResume' if this activity is // currently resumed, which implies we aren't sleeping. |