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

Commit 1e70620d authored by Vishwath Mohan's avatar Vishwath Mohan Committed by android-build-merger
Browse files

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

am: c189b9df

Change-Id: I31c0235d4467bec7de7ec672003613a4c4b3acf5
parents 7eb73bfd c189b9df

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

+1 −1
Original line number Diff line number Diff line
@@ -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 =