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

am: 23ee4f9370 Change-Id: I4aa2418d2d9cdd7b77bcf6b0957955c88a003c51
2019-05-28 14:18:29 -07:00
parent b385e8335b 23ee4f9370
commit eb237f73eb
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