PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use collectAsCallbackWithLifecycle" into main

Browse Source
This commit is contained in:
Chaohui Wang
2024-02-04 05:52:59 +00:00
committed by Android (Google) Code Review
parent b47d077dd0 213c998557
commit 2222ab9438
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt
View File

@@ -26,7 +26,7 @@ import android.content.pm.ApplicationInfo
import android.os.UserManager
import androidx.compose.runtime.Composable
import com.android.settings.R
import com.android.settingslib.spa.livedata.observeAsCallback
import com.android.settingslib.spa.lifecycle.collectAsCallbackWithLifecycle
import com.android.settingslib.spaprivileged.model.app.AppOpsController
import com.android.settingslib.spaprivileged.model.app.AppRecord
import com.android.settingslib.spaprivileged.model.app.userId
@@ -81,7 +81,7 @@ class InstallUnknownAppsListModel(private val context: Context) :
@Composable
override fun isAllowed(record: InstallUnknownAppsRecord) =
record.appOpsController.isAllowed.observeAsCallback()
record.appOpsController.isAllowed.collectAsCallbackWithLifecycle()
override fun isChangeable(record: InstallUnknownAppsRecord) =
isChangeable(record, getPotentialPackageNames(record.app.userId))

4
src/com/android/settings/spa/app/specialaccess/PictureInPicture.kt
View File

@@ -27,7 +27,7 @@ import android.content.pm.PackageManager.PackageInfoFlags
import android.util.Log
import androidx.compose.runtime.Composable
import com.android.settings.R
import com.android.settingslib.spa.livedata.observeAsCallback
import com.android.settingslib.spa.lifecycle.collectAsCallbackWithLifecycle
import com.android.settingslib.spaprivileged.model.app.AppOpsController
import com.android.settingslib.spaprivileged.model.app.AppRecord
import com.android.settingslib.spaprivileged.model.app.installed
@@ -92,7 +92,7 @@ class PictureInPictureListModel(private val context: Context) :
@Composable
override fun isAllowed(record: PictureInPictureRecord) =
record.appOpsController.isAllowed.observeAsCallback()
record.appOpsController.isAllowed.collectAsCallbackWithLifecycle()
override fun isChangeable(record: PictureInPictureRecord) = record.isSupport