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

Commit eb237f73 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 

am: 23ee4f93

Change-Id: I4aa2418d2d9cdd7b77bcf6b0957955c88a003c51
parents b385e833 23ee4f93

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

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

                    agentInfo = mActiveAgents.valueAt(index);

                }

                }





                boolean directUnlock = resolveInfo.serviceInfo.directBootAware

                boolean directUnlock = false;

                if (agentInfo.settings != null) {

                    directUnlock = resolveInfo.serviceInfo.directBootAware

                        && agentInfo.settings.canUnlockProfile;

                        && agentInfo.settings.canUnlockProfile;

                }





                if (directUnlock) {

                if (directUnlock) {

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

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