From 435e2f3b17b4cec4a8e5a460246b7b786ba768f6 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Mon, 17 Aug 2015 03:32:41 -0700 Subject: [PATCH] profiles: Don't bind the keyguard until ActivityManager is up Change-Id: I2f349d00c197cf5c4a492fb0892b3edd71479ea4 --- .../platform/internal/ProfileManagerService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileManagerService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileManagerService.java index e8affd19..d4d2b9d0 100644 --- a/cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileManagerService.java +++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileManagerService.java @@ -164,12 +164,18 @@ private void bindKeyguard() { } } + @Override + public void onBootPhase(int phase) { + if (phase == PHASE_ACTIVITY_MANAGER_READY) { + bindKeyguard(); + } + } + private void initialize() { initialize(false); } private void initialize(boolean skipFile) { - bindKeyguard(); mTriggerHelper = new ProfileTriggerHelper(mContext, mHandler, this); mProfiles = new HashMap(); mProfileNames = new HashMap();