From 500e5bdf6ba27081936708a866d0bff9cdfc9fc8 Mon Sep 17 00:00:00 2001 From: Chaohui Wang <chaohuiw@google.com> Date: Wed, 12 Apr 2023 08:54:41 +0800 Subject: [PATCH] Remove ExperimentalLifecycleComposeApi Bug: 276310170 Bug: 271609607 Test: m Settings (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2496e08204d92f08a563e3c0f16eb6a04c0ba93b) Merged-In: I5dc415ec6b59fe56c51844473a9cb2757eeb89c3 Change-Id: I5dc415ec6b59fe56c51844473a9cb2757eeb89c3 --- .../spaprivileged/model/enterprise/RestrictionsProvider.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/enterprise/RestrictionsProvider.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/enterprise/RestrictionsProvider.kt index ae362c894e6d..481555651398 100644 --- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/enterprise/RestrictionsProvider.kt +++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/enterprise/RestrictionsProvider.kt @@ -22,7 +22,6 @@ import android.os.UserHandle import android.os.UserManager import androidx.compose.runtime.Composable import androidx.compose.runtime.State -import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.android.settingslib.RestrictedLockUtils import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin @@ -86,7 +85,6 @@ internal class RestrictionsProviderImpl( emit(getRestrictedMode()) }.flowOn(Dispatchers.IO) - @OptIn(ExperimentalLifecycleComposeApi::class) @Composable override fun restrictedModeState() = restrictedMode.collectAsStateWithLifecycle(initialValue = null) -- GitLab