Google Git
Sign in
chromium / chromium / src / 3d963d4cc5c77da967e65f176a3745fc87bb9ec3
commit3d963d4cc5c77da967e65f176a3745fc87bb9ec3[log] [tgz]
authorShuhei Takahashi <nya@chromium.org>Tue Oct 01 01:38:12 2024
committerChromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com>Tue Oct 01 01:38:12 2024
tree8af7158ca21a4dad472dc1617f347e18947d09cb
parent36f63a773edcc2927b9ad855be255a6bf8af7c47 [diff]
[Settings] Avoid Instrumentation.startActivitySync

We're soon enabling the single-activity mode for the settings UI where a
single activity instance is used throughout the settings hierarchy. To
avoid launching a new activity while we continue to use intents for user
navigation, we set FLAG_ACTIVITY_SINGLE_TOP to intents if the
single-activity mode is enabled.

Currently site settings tests use SiteSettingsTestUtil that calls
Instrumentation.startActivitySync to start the settings activity, but
unfortunately it hangs for an intent with FLAG_ACTIVITY_SINGLE_TOP
because it does not start a new activity.

This patch changes SiteSettingsTestUtil to use Context.startActivity()
instead, combined together with
ApplicationTestUtils.waitForActivityClass to wait for the activity to be
resumed.

Bug: b/356743945
Change-Id: I84731d8599872b1729f6779c358173449f4fb9b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5874682
Commit-Queue: Shuhei Takahashi <nya@chromium.org>
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1362142}
1 file changed
tree: 8af7158ca21a4dad472dc1617f347e18947d09cb
  1. android_webview/
  2. apps/
  3. ash/
  4. base/
  5. build/
  6. build_overrides/
  7. buildtools/
  8. cc/
  9. chrome/
  10. chromecast/
  11. chromeos/
  12. codelabs/
  13. components/
  14. content/
  15. crypto/
  16. dbus/
  17. device/
  18. docs/
  19. extensions/
  20. fuchsia_web/
  21. gin/
  22. google_apis/
  23. google_update/
  24. gpu/
  25. headless/
  26. infra/
  27. ios/
  28. ipc/
  29. media/
  30. mojo/
  31. native_client_sdk/
  32. net/
  33. pdf/
  34. ppapi/
  35. printing/
  36. remoting/
  37. rlz/
  38. sandbox/
  39. services/
  40. skia/
  41. sql/
  42. storage/
  43. styleguide/
  44. testing/
  45. third_party/
  46. tools/
  47. ui/
  48. url/
  49. webkit/
  50. clank
  51. internal
  52. ios_internal
  53. native_client
  54. signing_keys
  55. v8
  56. .clang-format
  57. .clang-tidy
  58. .clangd
  59. .eslintrc.js
  60. .git-blame-ignore-revs
  61. .gitallowed
  62. .gitattributes
  63. .gitignore
  64. .gitmodules
  65. .gn
  66. .mailmap
  67. .rustfmt.toml
  68. .vpython3
  69. .yapfignore
  70. ATL_OWNERS
  71. AUTHORS
  72. BUILD.gn
  73. CODE_OF_CONDUCT.md
  74. codereview.settings
  75. CPPLINT.cfg
  76. CRYPTO_OWNERS
  77. DEPS
  78. DIR_METADATA
  79. LICENSE
  80. LICENSE.chromium_os
  81. OWNERS
  82. PRESUBMIT.py
  83. PRESUBMIT_test.py
  84. PRESUBMIT_test_mocks.py
  85. README.md
  86. WATCHLISTS
README.md

Logo Chromium

Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.

The project's web site is https://www.chromium.org.

To check out the source code locally, don't use git clone! Instead, follow the instructions on how to get the code.

Documentation in the source is rooted in docs/README.md.

Learn how to Get Around the Chromium Source Code Directory Structure.

For historical reasons, there are some small top level directories. Now the guidance is that new top level directories are for product (e.g. Chrome, Android WebView, Ash). Even if these products have multiple executables, the code should be in subdirectories of the product.

If you found a bug, please file it at https://crbug.com/new.