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

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

Merge "Check when trust agents do not declare a settings activity." into qt-dev 

am: 782e511f

Change-Id: Iea63913763fbc7bd3ce9404cb7b9f49fdbd82340
parents 853b3e0a 782e511f

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