Merge "Dump bypass controller state for debugging" into qt-r1-dev (0c66bddc) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -261,6 +261,8 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback {
		biometricSourceType);
		if (unlockAllowed) {
		startWakeAndUnlock(biometricSourceType);
		} else {
		Log.d(TAG, "onBiometricAuthenticated aborted by bypass controller");
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt

+32 −20

Original line number	Diff line number	Diff line
		@@ -21,11 +21,11 @@ import android.content.pm.PackageManager
		import android.hardware.biometrics.BiometricSourceType
		import android.hardware.face.FaceManager
		import android.provider.Settings
		import com.android.keyguard.KeyguardUpdateMonitor
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.statusbar.NotificationLockscreenUserManager
		import com.android.systemui.statusbar.StatusBarState
		import com.android.systemui.tuner.TunerService
		import java.io.PrintWriter
		import javax.inject.Inject
		import javax.inject.Singleton

		@@ -62,18 +62,15 @@ class KeyguardBypassController {
		}

		@Inject
		constructor(context: Context, tunerService: TunerService,
		constructor(
		context: Context,
		tunerService: TunerService,
		statusBarStateController: StatusBarStateController,
		lockscreenUserManager: NotificationLockscreenUserManager) {
		lockscreenUserManager: NotificationLockscreenUserManager
		) {
		unlockMethodCache = UnlockMethodCache.getInstance(context)
		this.statusBarStateController = statusBarStateController
		statusBarStateController.addCallback(object : StatusBarStateController.StateListener {
		override fun onStateChanged(newState: Int) {
		if (newState != StatusBarState.KEYGUARD) {
		pendingUnlockType = null;
		}
		}
		})

		if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) {
		return
		}
		@@ -82,16 +79,19 @@ class KeyguardBypassController {
		return
		}

		statusBarStateController.addCallback(object : StatusBarStateController.StateListener {
		override fun onStateChanged(newState: Int) {
		if (newState != StatusBarState.KEYGUARD) {
		pendingUnlockType = null
		}
		}
		})

		val dismissByDefault = if (context.resources.getBoolean(
		com.android.internal.R.bool.config_faceAuthDismissesKeyguard)) 1 else 0
		tunerService.addTunable(
		object : TunerService.Tunable {
		tunerService.addTunable(object : TunerService.Tunable {
		override fun onTuningChanged(key: String?, newValue: String?) {
		bypassEnabled = Settings.Secure.getIntForUser(
		context.contentResolver,
		Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD,
		dismissByDefault,
		KeyguardUpdateMonitor.getCurrentUser()) != 0
		bypassEnabled = tunerService.getValue(key, dismissByDefault) != 0
		}
		}, Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD)
		lockscreenUserManager.addUserChangedListener { pendingUnlockType = null }
		@@ -155,4 +155,16 @@ class KeyguardBypassController {
		fun onStartedGoingToSleep() {
		pendingUnlockType = null
		}

		fun dump(pw: PrintWriter) {
		pw.println("KeyguardBypassController:")
		pw.print(" pendingUnlockType: "); pw.println(pendingUnlockType)
		pw.print(" bypassEnabled: "); pw.println(bypassEnabled)
		pw.print(" canBypass: "); pw.println(canBypass())
		pw.print(" bouncerShowing: "); pw.println(bouncerShowing)
		pw.print(" isPulseExpanding: "); pw.println(isPulseExpanding)
		pw.print(" launchingAffordance: "); pw.println(launchingAffordance)
		pw.print(" qSExpanded: "); pw.println(qSExpanded)
		pw.print(" bouncerShowing: "); pw.println(bouncerShowing)
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -2387,6 +2387,10 @@ public class StatusBar extends SystemUI implements DemoMode,
		mLightBarController.dump(fd, pw, args);
		}

		if (mKeyguardBypassController != null) {
		mKeyguardBypassController.dump(pw);
		}

		if (mKeyguardUpdateMonitor != null) {
		mKeyguardUpdateMonitor.dump(fd, pw, args);
		}