Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 782e511f49

Change-Id: I1cdefb5ea5017ebf5e084421210841671356a751
This commit is contained in:
Vishwath Mohan
2019-05-28 14:11:36 -07:00
committed by android-build-merger
parent 22b4b7ae0b 782e511f49
commit 23ee4f9370
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/trust/TrustManagerService.java
View File

@@ -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;
&& agentInfo.settings.canUnlockProfile; if (agentInfo.settings != null) {
directUnlock = resolveInfo.serviceInfo.directBootAware
&& agentInfo.settings.canUnlockProfile;
}
if (directUnlock) { if (directUnlock) {
if (DEBUG) Slog.d(TAG, "refreshAgentList: trustagent " + name if (DEBUG) Slog.d(TAG, "refreshAgentList: trustagent " + name