Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d0525f7 authored by Tyler Saunders's avatar Tyler Saunders Committed by Android (Google) Code Review
Browse files

Merge "Remove ExperimentalLifecycleComposeApi" into udc-mainline-prod

parents 2cb87413 500e5bdf

packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/enterprise/RestrictionsProvider.kt

+0 −2
Original line number Diff line number Diff line
@@ -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)