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

Commit 985b4f4c authored by Evan Severson's avatar Evan Severson Committed by Android (Google) Code Review
Browse files

Merge "Fix pin requirement for sensor toggle dialog" into sc-dev

parents 3ec44592 56c522bd

packages/SystemUI/src/com/android/systemui/sensorprivacy/SensorUseStartedActivity.kt

+9 −18
Original line number Original line Diff line number Diff line
@@ -16,8 +16,6 @@ 




package com.android.systemui.sensorprivacy

package com.android.systemui.sensorprivacy





import android.app.KeyguardManager

import android.app.KeyguardManager.KeyguardDismissCallback

import android.content.DialogInterface

import android.content.DialogInterface

import android.content.Intent.EXTRA_PACKAGE_NAME

import android.content.Intent.EXTRA_PACKAGE_NAME

import android.content.pm.PackageManager

import android.content.pm.PackageManager
@@ -28,16 +26,15 @@ import android.hardware.SensorPrivacyManager.EXTRA_SENSOR 
import android.os.Bundle

import android.os.Bundle

import android.os.Handler

import android.os.Handler

import android.text.Html

import android.text.Html

import android.util.Log

import android.view.View.GONE

import android.view.View.GONE

import android.view.View.VISIBLE

import android.view.View.VISIBLE

import android.widget.ImageView

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.keyguard.KeyguardUpdateMonitor

import com.android.systemui.R

import com.android.systemui.R

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 javax.inject.Inject

import javax.inject.Inject





/**

/**
@@ -48,8 +45,8 @@ import javax.inject.Inject 
 */

 */

class SensorUseStartedActivity @Inject constructor(

class SensorUseStartedActivity @Inject constructor(

    private val sensorPrivacyController: IndividualSensorPrivacyController,

    private val sensorPrivacyController: IndividualSensorPrivacyController,

    private val keyguardManager: KeyguardManager,

    private val keyguardStateController: KeyguardStateController,

    private val keyguardUpdateMonitor: KeyguardUpdateMonitor

    private val keyguardDismissUtil: KeyguardDismissUtil

) : AlertActivity(), DialogInterface.OnClickListener {

) : AlertActivity(), DialogInterface.OnClickListener {





    companion object {

    companion object {
@@ -180,17 +177,11 @@ class SensorUseStartedActivity @Inject constructor( 
    override fun onClick(dialog: DialogInterface?, which: Int) {

    override fun onClick(dialog: DialogInterface?, which: Int) {

        when (which) {

        when (which) {

            BUTTON_POSITIVE -> {

            BUTTON_POSITIVE -> {

                if (keyguardUpdateMonitor.getUserHasTrust(userId)) {

                if (keyguardStateController.isMethodSecure && keyguardStateController.isShowing) {

                    keyguardManager

                    keyguardDismissUtil.executeWhenUnlocked({

                            .requestDismissKeyguard(this, object : KeyguardDismissCallback() {

                        override fun onDismissError() {

                            Log.e(LOG_TAG, "Cannot dismiss keyguard")

                        }



                        override fun onDismissSucceeded() {

                        disableSensorPrivacy()

                        disableSensorPrivacy()

                        }

                        false

                    })

                    }, false)

                } else {

                } else {

                    disableSensorPrivacy()

                    disableSensorPrivacy()

                }

                }