Fixes #5296 - #5298
Merged
Merged
Fixes #5296#5298
Conversation
copybara-service
Bot
force-pushed
the
test_991955579
branch
3 times, most recently
from
October 2, 2026 23:53
3f9be4d to
cf10c43
Compare
copybara-service
Bot
changed the title
copybara-service
Bot
force-pushed
the
test_991955579
branch
from
October 3, 2026 07:42
cf10c43 to
636b898
Compare
Fix an issue where `@ActivityRetainedSavedState` `SavedStateHandle` fails to restore after a configuration change. When an activity's retained `SavedStateHandle` is accessed for the first time only after a configuration change, its creation extras are re-initialized manually rather than through `ViewModelProvider`, which caused the ViewModel key required to create the `SavedStateHandle` to be lost. Preserve the original ViewModel key when the holder is first initialized so it can be restored across configuration changes. Also upgrade the AndroidX Lifecycle dependency to 2.6.2 (along with compatible Activity, Fragment, and SavedState versions), which includes a required upstream fix for restoring saved state across activity recreation. RELNOTES=Fixes #5296: Fix an issue where `@ActivityRetainedSavedState` `SavedStateHandle` fails to restore if accessed for the first time after a configuration change. PiperOrigin-RevId: 992759144
copybara-service
Bot
force-pushed
the
test_991955579
branch
from
October 3, 2026 08:10
636b898 to
b3dc7ee
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #5296
Fix an issue where
@ActivityRetainedSavedStateSavedStateHandlefails to restore after a configuration change.When an activity's retained
SavedStateHandleis accessed for the first time only after a configuration change, its creation extras are re-initialized manually rather than throughViewModelProvider, which caused the ViewModel key required to create theSavedStateHandleto be lost. Preserve the original ViewModel key when the holder is first initialized so it can be restored across configuration changes.Also upgrade the AndroidX Lifecycle dependency to 2.6.2 (along with compatible Activity, Fragment, and SavedState versions), which includes a required upstream fix for restoring saved state across activity recreation.
RELNOTES=Fixes #5296: Fix an issue where
@ActivityRetainedSavedStateSavedStateHandlefails to restore if accessed for the first time after a configuration change.