Revert "Fix the op mode dependency for the second toggle:"
This reverts commit 78f99c6a67.
Reason for revert: The Fedhot team cancel the egress data permission
Change-Id: I57c2fad0450f5f5ad36a5ff8a39ed42603b09d49
This commit is contained in:
committed by
Android (Google) Code Review
parent
78f99c6a67
commit
19a0292230
@@ -56,12 +56,9 @@ class VoiceActivationAppsListModel(context: Context) : AppOpPermissionListModel(
|
||||
override val appOp = AppOpsManager.OP_RECEIVE_SANDBOX_TRIGGER_AUDIO
|
||||
override val permission = Manifest.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO
|
||||
override val setModeByUid = true
|
||||
private var receiveDetectionTrainingDataOpController:AppOpsController? = null
|
||||
|
||||
override fun setAllowed(record: AppOpPermissionRecord, newAllowed: Boolean) {
|
||||
super.setAllowed(record, newAllowed)
|
||||
if (!newAllowed && receiveDetectionTrainingDataOpController != null) {
|
||||
receiveDetectionTrainingDataOpController!!.setAllowed(false)
|
||||
}
|
||||
logPermissionChange(newAllowed)
|
||||
}
|
||||
|
||||
@@ -82,21 +79,20 @@ class VoiceActivationAppsListModel(context: Context) : AppOpPermissionListModel(
|
||||
isReceiveSandBoxTriggerAudioOpAllowed: () -> Boolean?
|
||||
): ReceiveDetectionTrainingDataOpSwitchModel {
|
||||
val context = LocalContext.current
|
||||
receiveDetectionTrainingDataOpController = remember {
|
||||
val ReceiveDetectionTrainingDataOpController = remember {
|
||||
AppOpsController(
|
||||
context = context,
|
||||
app = record.app,
|
||||
op = AppOpsManager.OP_RECEIVE_SANDBOXED_DETECTION_TRAINING_DATA,
|
||||
)
|
||||
}
|
||||
val isReceiveDetectionTrainingDataOpAllowed = isReceiveDetectionTrainingDataOpAllowed(record, receiveDetectionTrainingDataOpController!!)
|
||||
|
||||
val isReceiveDetectionTrainingDataOpAllowed = isReceiveDetectionTrainingDataOpAllowed(record, ReceiveDetectionTrainingDataOpController)
|
||||
return remember(record) {
|
||||
ReceiveDetectionTrainingDataOpSwitchModel(
|
||||
context,
|
||||
record,
|
||||
isReceiveSandBoxTriggerAudioOpAllowed,
|
||||
receiveDetectionTrainingDataOpController!!,
|
||||
ReceiveDetectionTrainingDataOpController,
|
||||
isReceiveDetectionTrainingDataOpAllowed,
|
||||
)
|
||||
}.also { model -> LaunchedEffect(model, Dispatchers.Default) { model.initState() } }
|
||||
|
||||
Reference in New Issue
Block a user