diff options
| author | 2023-08-29 18:35:41 +0000 | |
|---|---|---|
| committer | 2023-08-29 18:35:41 +0000 | |
| commit | 360ca23784e44cbf779b4470ccd42b5ec1dcba3a (patch) | |
| tree | 67e81ebd7b9e3518c6148cf44d8db2afb6d71511 /java/tests | |
| parent | 9d690ffbbc0abbf1e4f9007598a3aeb9bd733820 (diff) | |
| parent | 6002e350ff8d04a30fc9cd04ac4ceb6b74dae1fb (diff) | |
Merge "Revert "Revert "Update TestLifecycleOwner to match converted to ..."" into udc-dev-plus-aosp am: 6002e350ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/24422701
Change-Id: I1bdb0b934d5b3093d48bf409d80ebc1917568929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/tests')
| -rw-r--r-- | java/tests/src/com/android/intentresolver/TestLifecycleOwner.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/tests/src/com/android/intentresolver/TestLifecycleOwner.kt b/java/tests/src/com/android/intentresolver/TestLifecycleOwner.kt index f47e343f..7e588f98 100644 --- a/java/tests/src/com/android/intentresolver/TestLifecycleOwner.kt +++ b/java/tests/src/com/android/intentresolver/TestLifecycleOwner.kt @@ -23,7 +23,7 @@ import androidx.lifecycle.LifecycleRegistry internal class TestLifecycleOwner : LifecycleOwner { private val lifecycleRegistry = LifecycleRegistry.createUnsafe(this) - override fun getLifecycle(): Lifecycle = lifecycleRegistry + override val lifecycle: Lifecycle get() = lifecycleRegistry var state: Lifecycle.State get() = lifecycle.currentState |