commit c189b9df3716d9fd5b20e82d91fc24d9f5a24333
author Vishwath Mohan <vishwath@google.com> Thu Jun 20 19:36:11 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 20 19:36:11 2019 -0700
tree 54459d17a57c44fb77dcd21b8ffe19c085629848
parent e073ec7cac55e14078f8c36a37a430235eda23c3
parent b9cead91f80184fa0cc58ed49f74bc3cdb142ffd

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

Change-Id: I28b2cd7d17191c36c691e2c6940de021e532ff96

services/core/java/com/android/server/trust/TrustManagerService.java

diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java
index a2eb40b..d6a9f427 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 @@
                         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 =