Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 03563509892992a392ddd560a3c485e449b99594
commit03563509892992a392ddd560a3c485e449b99594[log] [tgz]
authorChris Göllner <chrisgollner@google.com>Wed Jun 05 14:28:24 2024 +0100
committerChris Göllner <chrisgollner@google.com>Wed Jun 05 16:31:20 2024 +0100
tree6e2b7260d36e3761f38509e50d2e9c566c2955ea
parentf7caa4dfabb88bae908153e1cfb32f275dc19305 [diff]
ShortcutHelper: fix UnsupportedOperationException when merging shortcuts

The crash can happen when the received app shortcut groups is an empty
list that was instantiated using Collections.emptyList(). Calling add()
or addAll() on it will crash, as it isn't implemented.

Fixes: 345025561
Test: KeyboardShortcutsTest
Flag: NONE simple bug fix
Change-Id: I321d531057856bba0600dbf9407521790d5304e9
2 files changed
tree: 6e2b7260d36e3761f38509e50d2e9c566c2955ea
  1. .prebuilt_info/
  2. apct-tests/
  3. apex/
  4. api/
  5. boot/
  6. cmds/
  7. config/
  8. core/
  9. data/
  10. docs/
  11. drm/
  12. errorprone/
  13. graphics/
  14. identity/
  15. keystore/
  16. libs/
  17. location/
  18. media/
  19. mime/
  20. mms/
  21. native/
  22. nfc/
  23. nfc-extras/
  24. obex/
  25. omapi/
  26. opengl/
  27. packages/
  28. proto/
  29. ravenwood/
  30. rs/
  31. samples/
  32. sax/
  33. services/
  34. startop/
  35. telecomm/
  36. telephony/
  37. test-base/
  38. test-junit/
  39. test-legacy/
  40. test-mock/
  41. test-runner/
  42. tests/
  43. tools/
  44. wifi/
  45. .clang-format
  46. .gitignore
  47. .mailmap
  48. AconfigFlags.bp
  49. ADPF_OWNERS
  50. Android.bp
  51. BAL_OWNERS
  52. BATTERY_STATS_OWNERS
  53. BROADCASTS_OWNERS
  54. CleanSpec.mk
  55. DREAM_MANAGER_OWNERS
  56. framework-jarjar-rules.txt
  57. GAME_MANAGER_OWNERS
  58. INPUT_OWNERS
  59. INTENT_OWNERS
  60. lint-baseline.xml
  61. LSE_APP_COMPAT_OWNERS
  62. MEMORY_OWNERS
  63. METADATA
  64. MODULE_LICENSE_APACHE2
  65. MULTIUSER_OWNERS
  66. NOTICE
  67. OWNERS
  68. OWNERS.md
  69. PACKAGE_MANAGER_OWNERS
  70. pathmap.mk
  71. PERFORMANCE_OWNERS
  72. PREUPLOAD.cfg
  73. ProtoLibraries.bp
  74. Ravenwood.bp
  75. SECURITY_STATE_OWNERS
  76. SQLITE_OWNERS
  77. TEST_MAPPING
  78. TestProtoLibraries.bp
  79. THERMAL_OWNERS
  80. TRACE_OWNERS
  81. WEAR_OWNERS
  82. ZYGOTE_OWNERS