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

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

Merge "Merge "Check when trust agents do not declare a settings activity."... 

Merge "Merge "Check when trust agents do not declare a settings activity." into qt-dev am: 782e511f am: 23ee4f93" into qt-r1-dev-plus-aosp
am: 5a365379

Change-Id: I17b66525afa3a6d7f536827b2f9ed0c507a13e8c
parents c9ae49c1 5a365379

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

+5 −2
Original line number Diff line number Diff line
@@ -518,8 +518,11 @@ public class TrustManagerService extends SystemService { 
                    agentInfo = mActiveAgents.valueAt(index);

                }



                boolean directUnlock = resolveInfo.serviceInfo.directBootAware

                boolean directUnlock = false;

                if (agentInfo.settings != null) {

                    directUnlock = resolveInfo.serviceInfo.directBootAware

                        && agentInfo.settings.canUnlockProfile;

                }



                if (directUnlock) {

                    if (DEBUG) Slog.d(TAG, "refreshAgentList: trustagent " + name