Merge "Add logs for sensor privacy enable dialog." into sc-dev am: 81f862389f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15239319

Change-Id: I26ecab57b954f37d1a1b94eec7d7113c9b5d0e9d
This commit is contained in:
Pyuli Naithani
2021-07-09 19:12:08 +00:00
committed by Automerger Merge Worker

View File

@@ -38,6 +38,10 @@ 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
import javax.inject.Inject import javax.inject.Inject
import com.android.internal.util.FrameworkStatsLog.PRIVACY_TOGGLE_DIALOG_INTERACTION
import com.android.internal.util.FrameworkStatsLog.PRIVACY_TOGGLE_DIALOG_INTERACTION__ACTION__ENABLE
import com.android.internal.util.FrameworkStatsLog.PRIVACY_TOGGLE_DIALOG_INTERACTION__ACTION__CANCEL
import com.android.internal.util.FrameworkStatsLog.write
/** /**
* Dialog to be shown on top of apps that are attempting to use a sensor (e.g. microphone) which is * Dialog to be shown on top of apps that are attempting to use a sensor (e.g. microphone) which is
@@ -185,16 +189,25 @@ class SensorUseStartedActivity @Inject constructor(
keyguardDismissUtil.executeWhenUnlocked({ keyguardDismissUtil.executeWhenUnlocked({
bgHandler.postDelayed({ bgHandler.postDelayed({
disableSensorPrivacy() disableSensorPrivacy()
write(PRIVACY_TOGGLE_DIALOG_INTERACTION,
PRIVACY_TOGGLE_DIALOG_INTERACTION__ACTION__ENABLE,
sensorUsePackageName)
}, UNLOCK_DELAY_MILLIS) }, UNLOCK_DELAY_MILLIS)
false false
}, false, true) }, false, true)
} else { } else {
disableSensorPrivacy() disableSensorPrivacy()
write(PRIVACY_TOGGLE_DIALOG_INTERACTION,
PRIVACY_TOGGLE_DIALOG_INTERACTION__ACTION__ENABLE,
sensorUsePackageName)
} }
} }
BUTTON_NEGATIVE -> { BUTTON_NEGATIVE -> {
unsuppressImmediately = false unsuppressImmediately = false
write(PRIVACY_TOGGLE_DIALOG_INTERACTION,
PRIVACY_TOGGLE_DIALOG_INTERACTION__ACTION__CANCEL,
sensorUsePackageName)
} }
} }