diff options
| author | 2015-06-19 23:28:10 +0000 | |
|---|---|---|
| committer | 2015-06-19 23:28:10 +0000 | |
| commit | 73187e5761063340d2092c37f5584c9b56e4a11e (patch) | |
| tree | 70bef52cbf8e65e808a0361ebc8b6f971f5ca130 | |
| parent | c3fbb0ce6c04ea5ece37bf4529271cb14296135b (diff) | |
| parent | dd91362c2c65dbcd781034a16f293d5489946f3e (diff) | |
am dd91362c: Make sure home activity gets resumed after started.
* commit 'dd91362c2c65dbcd781034a16f293d5489946f3e':
Make sure home activity gets resumed after started.
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index a2c8c71e147c..ed7859bf3774 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -835,8 +835,18 @@ public final class ActivityStackSupervisor implements DisplayListener { void startHomeActivity(Intent intent, ActivityInfo aInfo, String reason) { moveHomeStackTaskToTop(HOME_ACTIVITY_TYPE, reason); - startActivityLocked(null, intent, null, aInfo, null, null, null, null, 0, 0, 0, null, - 0, 0, 0, null, false, null, null, null); + startActivityLocked(null /* caller */, intent, null /* resolvedType */, aInfo, + null /* voiceSession */, null /* voiceInteractor */, null /* resultTo */, + null /* resultWho */, 0 /* requestCode */, 0 /* callingPid */, 0 /* callingUid */, + null /* callingPackage */, 0 /* realCallingPid */, 0 /* realCallingUid */, + 0 /* startFlags */, null /* options */, false /* componentSpecified */, + null /* outActivity */, null /* container */, null /* inTask */); + if (inResumeTopActivity) { + // If we are in resume section already, home activity will be initialized, but not + // resumed (to avoid recursive resume) and will stay that way until something pokes it + // again. We need to schedule another resume. + scheduleResumeTopActivities(); + } } final int startActivityMayWait(IApplicationThread caller, int callingUid, |