summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2015-04-26 11:07:19 -0700
committerRoman Birg <roman@cyngn.com>2015-04-26 11:07:19 -0700
commit8fa506205ec1fdeabd965d3622a825ddfe30794c (patch)
tree3d0935679196034ad6f4b77549608cf3f0e15854
parente77bc46f9d05b9c2f0eb2b37be2227e993fd6efa (diff)
downloadandroid_packages_apps_Profiles-8fa506205ec1fdeabd965d3622a825ddfe30794c.tar.gz
android_packages_apps_Profiles-8fa506205ec1fdeabd965d3622a825ddfe30794c.tar.bz2
android_packages_apps_Profiles-8fa506205ec1fdeabd965d3622a825ddfe30794c.zip
StartUpReceiver: handle case when there were no trust agentsstable/cm-12.1-YOG3C
Change-Id: I2261c1720e6b69c1bbb15d2fa3b0536be855ec3a Signed-off-by: Roman Birg <roman@cyngn.com>
-rw-r--r--src/org/cyanogenmod/profiles/StartUpReceiver.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/org/cyanogenmod/profiles/StartUpReceiver.java b/src/org/cyanogenmod/profiles/StartUpReceiver.java
index d33f407..08574db 100644
--- a/src/org/cyanogenmod/profiles/StartUpReceiver.java
+++ b/src/org/cyanogenmod/profiles/StartUpReceiver.java
@@ -23,6 +23,7 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import com.android.internal.widget.LockPatternUtils;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -38,6 +39,9 @@ public class StartUpReceiver extends BroadcastReceiver {
ComponentName profileTrustAgent = new ComponentName(context, ProfilesTrustAgent.class);
List<ComponentName> enabledTrustAgents = lockUtils.getEnabledTrustAgents();
+ if (enabledTrustAgents == null) {
+ enabledTrustAgents = new ArrayList<>();
+ }
if (!enabledTrustAgents.contains(profileTrustAgent)) {
enabledTrustAgents.add(profileTrustAgent);
lockUtils.setEnabledTrustAgents(enabledTrustAgents);