Merge "Switch trust agents to extend unlock mode by default." into qt-dev

am: b9cead91f8 Change-Id: Ifbc1e5d15337a7a678ee4ef9ef346dcf046cb69b
2019-06-20 19:36:14 -07:00
parent 4a686288a5 b9cead91f8
commit 254a302641
1 changed files with 1 additions and 1 deletions
--- 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 =