Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Delay unmuting sensor when device is unlocked" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-24 17:06:40 +00:00
committed by Android (Google) Code Review
parent e9408eaf89 26c2f8d320
commit dc9a03db06
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/sensorprivacy/SensorUseStartedActivity.kt
View File

@@ -32,6 +32,7 @@ import android.widget.ImageView
import com.android.internal.app.AlertActivity import com.android.internal.app.AlertActivity
import com.android.internal.widget.DialogTitle import com.android.internal.widget.DialogTitle
import com.android.systemui.R import com.android.systemui.R
import com.android.systemui.dagger.qualifiers.Background
import com.android.systemui.statusbar.phone.KeyguardDismissUtil import com.android.systemui.statusbar.phone.KeyguardDismissUtil
import com.android.systemui.statusbar.policy.IndividualSensorPrivacyController import com.android.systemui.statusbar.policy.IndividualSensorPrivacyController
import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.statusbar.policy.KeyguardStateController
@@ -46,13 +47,15 @@ import javax.inject.Inject
class SensorUseStartedActivity @Inject constructor( class SensorUseStartedActivity @Inject constructor(
private val sensorPrivacyController: IndividualSensorPrivacyController, private val sensorPrivacyController: IndividualSensorPrivacyController,
private val keyguardStateController: KeyguardStateController, private val keyguardStateController: KeyguardStateController,
private val keyguardDismissUtil: KeyguardDismissUtil private val keyguardDismissUtil: KeyguardDismissUtil,
@Background private val bgHandler: Handler
) : AlertActivity(), DialogInterface.OnClickListener { ) : AlertActivity(), DialogInterface.OnClickListener {
companion object { companion object {
private val LOG_TAG = SensorUseStartedActivity::class.java.simpleName private val LOG_TAG = SensorUseStartedActivity::class.java.simpleName
private const val SUPPRESS_REMINDERS_REMOVAL_DELAY_MILLIS = 2000L private const val SUPPRESS_REMINDERS_REMOVAL_DELAY_MILLIS = 2000L
private const val UNLOCK_DELAY_MILLIS = 200L
private const val CAMERA = SensorPrivacyManager.Sensors.CAMERA private const val CAMERA = SensorPrivacyManager.Sensors.CAMERA
private const val MICROPHONE = SensorPrivacyManager.Sensors.MICROPHONE private const val MICROPHONE = SensorPrivacyManager.Sensors.MICROPHONE
@@ -179,9 +182,12 @@ class SensorUseStartedActivity @Inject constructor(
BUTTON_POSITIVE -> { BUTTON_POSITIVE -> {
if (keyguardStateController.isMethodSecure && keyguardStateController.isShowing) { if (keyguardStateController.isMethodSecure && keyguardStateController.isShowing) {
keyguardDismissUtil.executeWhenUnlocked({ keyguardDismissUtil.executeWhenUnlocked({
disableSensorPrivacy() bgHandler.postDelayed({
disableSensorPrivacy()
}, UNLOCK_DELAY_MILLIS)
false false
}, false, false) }, false, true)
} else { } else {
disableSensorPrivacy() disableSensorPrivacy()
} }
@@ -201,7 +207,7 @@ class SensorUseStartedActivity @Inject constructor(
sensorPrivacyController sensorPrivacyController
.suppressSensorPrivacyReminders(sensorUsePackageName, false) .suppressSensorPrivacyReminders(sensorUsePackageName, false)
} else { } else {
Handler(mainLooper).postDelayed({ bgHandler.postDelayed({
sensorPrivacyController sensorPrivacyController
.suppressSensorPrivacyReminders(sensorUsePackageName, false) .suppressSensorPrivacyReminders(sensorUsePackageName, false)
}, SUPPRESS_REMINDERS_REMOVAL_DELAY_MILLIS) }, SUPPRESS_REMINDERS_REMOVAL_DELAY_MILLIS)