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

Commit 19a02922 authored by Faye Yan's avatar Faye Yan Committed by Android (Google) Code Review
Browse files

Revert "Fix the op mode dependency for the second toggle:" 

This reverts commit 78f99c6a.

Reason for revert: The Fedhot team cancel the egress data permission

Change-Id: I57c2fad0450f5f5ad36a5ff8a39ed42603b09d49
parent 78f99c6a

src/com/android/settings/spa/app/specialaccess/VoiceActivationApps.kt

+4 −8
Original line number Diff line number Diff line
@@ -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() } }