summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorBryce Lee <brycelee@google.com>2018-01-30 16:00:03 -0800
committerBryce Lee <brycelee@google.com>2018-02-05 07:56:51 -0800
commit5f0e28fb2f32b767c102703613569347e0af822b (patch)
treeb7bae2fd0de45029075a0c7861a9e03d60bc2f2b /tools/aapt2/java/JavaClassGenerator.cpp
parent609017b275a0d230a8d74d047ce29c12234c6a94 (diff)
Properly handle start results when using wait flag.
Previously, delivering an intent to the foreground activity was inccorectly classified as START_TASK_TO_FRONT, rather than START_DELIVERED_TO_TOP. In the direct case, this occurs when the target activity is already in front. In the indirect case, this can occur when the target activity is in the background and launched by a trampoline in the same task. The trampoline launch will bring forward the task. However, since it is not focusable (finishing at the time the second launch occurs), the target activity is already on top. This changelist rectifies this issue by first handling START_DELIVERED_TO_TOP in the direct wait case. This includes setting the who value of result to the started real activity. This changelist addresses the indirect case by reporting delivered to top in the case there are waiting activities after a result. Fixes: 72654906 Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerAmStartOptionsTests Test: atest FrameworksServicesTests:com.android.server.am.ActivityStackSupervisorTests Change-Id: I65043e35ef8a20f90bf7cccbf4f1caf110cca246
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions