From d3268c2dca1f09b6cef01579588b7aeb7c867cb9 Mon Sep 17 00:00:00 2001 From: Vishwath Mohan Date: Wed, 19 Jun 2019 17:20:45 -0700 Subject: [PATCH] Switch trust agents to extend unlock mode by default. This CL changes the default behavior for trust agents to extend unlock mode. The Q droidfood phase allowed trust agent behavior to switch between active unlock (legacy behavior) and extend unlock modes --- where the extend unlock mode would prevent a trust agent (such as Smart Lock) from actively unlocking a locked phone, instead only allowing it to extend the duration that an already unlocked phone can continue to stay in the unlocked state. In preparation for Q proper, the developer options that controlled this toggle are being removed, and extend unlock mode is the only allowed mode of behavior for trust agents. Bug: 120871688 Test: Trust agents (like Smart Lock) only extend unlock on Q Merged-In: Ifad45f90e0f2b5c3d180a74a97a89d45d75cb02a Change-Id: Ifad45f90e0f2b5c3d180a74a97a89d45d75cb02a --- .../core/java/com/android/server/trust/TrustManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java index a2eb40b0c6fa9..d6a9f42738a17 100644 --- a/services/core/java/com/android/server/trust/TrustManagerService.java +++ b/services/core/java/com/android/server/trust/TrustManagerService.java @@ -237,7 +237,7 @@ public class TrustManagerService extends SystemService { Settings.Secure.getIntForUser( mContentResolver, Settings.Secure.TRUST_AGENTS_EXTEND_UNLOCK, - 0 /* default */, + 1 /* default */, mCurrentUser) != 0; } else if (LOCK_SCREEN_WHEN_TRUST_LOST.equals(uri)) { mLockWhenTrustLost =