summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anvesh Renikindi <renikindi@google.com> 2023-09-13 16:29:32 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-09-13 16:29:32 +0000
commitb1ab8e9d84eb4688c09442f4c0689350a8f9a574 (patch)
treedd726524cc5175ceb3eb097458f4e2af2069dd68
parent385d811e55c9d4f5c104777634e279619cd98d6a (diff)
parent9fab01220027ed8de11b10e46b58da8179b651ba (diff)
Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future
-rw-r--r--packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/enterprise/RestrictionsProvider.kt2
1 files changed, 0 insertions, 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)