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

Merge "Revert "Add the second toggle for the egress data permission on voice activation"" into main

Browse Source
This commit is contained in:
Faye Yan
2024-01-26 22:16:02 +00:00
committed by Android (Google) Code Review
parent 245cb5f6d6 97e198b096
commit b170858886
2 changed files with 0 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/com/android/settings/spa/app/specialaccess/VoiceActivationApps.kt
View File

@@ -20,24 +20,12 @@ import android.Manifest
import android.app.AppOpsManager
import android.app.settings.SettingsEnums
import android.content.Context
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalContext
import com.android.settings.R
import com.android.settings.overlay.FeatureFactory
import com.android.settingslib.spa.widget.preference.SwitchPreference
import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
import com.android.settingslib.spaprivileged.model.app.AppOpsController
import com.android.settingslib.spaprivileged.model.app.PackageManagers.hasGrantPermission
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
import com.android.settingslib.spaprivileged.template.app.AppOpPermissionRecord
import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListProvider
import kotlinx.coroutines.Dispatchers
/**
* This class builds an App List under voice activation apps and the individual page which
@@ -65,84 +53,6 @@ class VoiceActivationAppsListModel(context: Context) : AppOpPermissionListModel(
override fun isChangeable(record: AppOpPermissionRecord): Boolean =
super.isChangeable(record) && record.app.hasGrantPermission(permission)
@Composable
override fun InfoPageAdditionalContent(
record: AppOpPermissionRecord,
isAllowed: () -> Boolean?,
) {
SwitchPreference(createReceiveDetectionTrainingDataOpSwitchModel(record, isAllowed))
}
@Composable
private fun createReceiveDetectionTrainingDataOpSwitchModel(
record: AppOpPermissionRecord,
isReceiveSandBoxTriggerAudioOpAllowed: () -> Boolean?
): ReceiveDetectionTrainingDataOpSwitchModel {
val context = LocalContext.current
val ReceiveDetectionTrainingDataOpController = remember {
AppOpsController(
context = context,
app = record.app,
op = AppOpsManager.OP_RECEIVE_SANDBOXED_DETECTION_TRAINING_DATA,
)
}
val isReceiveDetectionTrainingDataOpAllowed = isReceiveDetectionTrainingDataOpAllowed(record, ReceiveDetectionTrainingDataOpController)
return remember(record) {
ReceiveDetectionTrainingDataOpSwitchModel(
context,
record,
isReceiveSandBoxTriggerAudioOpAllowed,
ReceiveDetectionTrainingDataOpController,
isReceiveDetectionTrainingDataOpAllowed,
)
}.also { model -> LaunchedEffect(model, Dispatchers.Default) { model.initState() } }
}
private inner class ReceiveDetectionTrainingDataOpSwitchModel(
context: Context,
private val record: AppOpPermissionRecord,
isReceiveSandBoxTriggerAudioOpAllowed: () -> Boolean?,
receiveDetectionTrainingDataOpController: AppOpsController,
isReceiveDetectionTrainingDataOpAllowed: () -> Boolean?,
) : SwitchPreferenceModel {
private var appChangeable by mutableStateOf(true)
override val title: String = context.getString(R.string.permit_receive_sandboxed_detection_training_data)
override val summary: () -> String = { context.getString(R.string.receive_sandboxed_detection_training_data_description) }
override val checked = { isReceiveDetectionTrainingDataOpAllowed() == true && isReceiveSandBoxTriggerAudioOpAllowed() == true }
override val changeable = { appChangeable && isReceiveSandBoxTriggerAudioOpAllowed() == true }
fun initState() {
appChangeable = isChangeable(record)
}
override val onCheckedChange: (Boolean) -> Unit = { newChecked ->
receiveDetectionTrainingDataOpController.setAllowed(newChecked)
}
}
@Composable
private fun isReceiveDetectionTrainingDataOpAllowed(
record: AppOpPermissionRecord,
controller: AppOpsController
): () -> Boolean? {
if (record.hasRequestBroaderPermission) {
// Broader permission trumps the specific permission.
return { true }
}
val mode = controller.mode.observeAsState()
return {
when (mode.value) {
null -> null
AppOpsManager.MODE_ALLOWED -> true
AppOpsManager.MODE_DEFAULT -> record.app.hasGrantPermission(
Manifest.permission.RECEIVE_SANDBOXED_DETECTION_TRAINING_DATA)
else -> false
}
}
}
private fun logPermissionChange(newAllowed: Boolean) {
val category = when {
newAllowed -> SettingsEnums.APP_SPECIAL_PERMISSION_RECEIVE_SANDBOX_TRIGGER_AUDIO_ALLOW