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

2019-05-28 21:00:20 +00:00
parent 060c29e951 60ea553423
commit 782e511f49
1 changed files with 5 additions and 2 deletions
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -518,8 +518,11 @@ public class TrustManagerService extends SystemService {
                    agentInfo = mActiveAgents.valueAt(index);
                }

-                boolean directUnlock = resolveInfo.serviceInfo.directBootAware
-                    && agentInfo.settings.canUnlockProfile;
+                boolean directUnlock = false;
+                if (agentInfo.settings != null) {
+                    directUnlock = resolveInfo.serviceInfo.directBootAware
+                        && agentInfo.settings.canUnlockProfile;
+                }

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