Google Git
Sign in
android / platform / frameworks / base / 0c4c18ff00b6
commit0c4c18ff00b658f1838255f8f67c924d3d98ed47[log] [tgz]
authorWillie Koomson <wvk@google.com>Mon Jun 23 02:52:29 2025 +0000
committerWillie Koomson <wvk@google.com>Mon Jun 23 02:52:29 2025 +0000
treee78d3e1f866cd2061c514384b2f9de63f97800c6
parenta34fcae5bb187ba515e9dd4f9dc8f5b5571bfb77 [diff]
Save ShortcutUser before rewriting ShortcutPackageItems

This change modifies ShortcutService.injectSaveUser to save the
ShortcutUser before rewriting ShortcutPackageItems. This way, if
saveUserInternalLocked fails, we avoid deleting the ShortcutPackageItems
(because we won't be able to rewrite them).

Bug: 417712196
Test: Manually tested with repro steps from the bug
Flag: EXEMPT bugfix
Change-Id: I567b4d8efa0610da54dd96c84c038f1fde7b8cf2
1 file changed
tree: e78d3e1f866cd2061c514384b2f9de63f97800c6
  1. .prebuilt_info/
  2. android-sdk-flags/
  3. apct-tests/
  4. apex/
  5. api/
  6. boot/
  7. cmds/
  8. config/
  9. core/
  10. data/
  11. docs/
  12. drm/
  13. errorprone/
  14. graphics/
  15. identity/
  16. keystore/
  17. libs/
  18. location/
  19. media/
  20. mime/
  21. mms/
  22. native/
  23. nfc-extras/
  24. nfc-non-updatable/
  25. obex/
  26. omapi/
  27. opengl/
  28. packages/
  29. proto/
  30. ravenwood/
  31. rs/
  32. samples/
  33. sax/
  34. services/
  35. startop/
  36. telecomm/
  37. telephony/
  38. test-base/
  39. test-junit/
  40. test-legacy/
  41. test-mock/
  42. test-runner/
  43. tests/
  44. tools/
  45. vendor/
  46. wifi/
  47. .clang-format
  48. .gitignore
  49. .mailmap
  50. AconfigFlags.bp
  51. ACTIVITY_MANAGER_OWNERS
  52. ACTIVITY_SECURITY_OWNERS
  53. ADPF_OWNERS
  54. Android.bp
  55. BAL_OWNERS
  56. BATTERY_STATS_OWNERS
  57. BROADCASTS_OWNERS
  58. CleanSpec.mk
  59. FF_LEADS_OWNERS
  60. framework-jarjar-rules.txt
  61. GAME_MANAGER_OWNERS
  62. INPUT_OWNERS
  63. INTENT_OWNERS
  64. libcore-readonly.aconfig
  65. lint-baseline.xml
  66. LSE_APP_COMPAT_OWNERS
  67. MEMORY_OWNERS
  68. MESSAGE_QUEUE_OWNERS
  69. METADATA
  70. MODULE_LICENSE_APACHE2
  71. MULTIUSER_OWNERS
  72. NOTICE
  73. OOM_ADJUSTER_OWNERS
  74. OWNERS
  75. OWNERS.md
  76. PACKAGE_MANAGER_OWNERS
  77. pathmap.mk
  78. PERFETTO_OWNERS
  79. PERFORMANCE_OWNERS
  80. PREUPLOAD.cfg
  81. PREUPLOAD_OWNERS
  82. ProtoLibraries.bp
  83. Ravenwood.bp
  84. SDK_OWNERS
  85. SECURITY_STATE_OWNERS
  86. SQLITE_OWNERS
  87. TEST_MAPPING
  88. TestProtoLibraries.bp
  89. THERMAL_OWNERS
  90. TRACE_OWNERS
  91. TRADE_IN_MODE_OWNERS
  92. WEAR_OWNERS
  93. ZYGOTE_OWNERS