Fix dependency between keyguard/dexopt/AccessibilityManagerService.
This fixes a bug on userdebug builds where dexopt hadn't completed
before the service is needed. The resulting crash prevented dexopt
from completing, resulting in a reboot loop and perpetual issue starting
the service.
The solution is to hold off on creating keyguard until the system is ready.
It also moves the creation of the AccessibilityManagerService singleton back
into the system process.
Fixes bug 8287106
Change-Id: I96e15c084d38c255fd8f6bca6f21a0785b82ec74
diff --git a/packages/Keyguard/Android.mk b/packages/Keyguard/Android.mk
index f8827f6..2f8edad 100644
--- a/packages/Keyguard/Android.mk
+++ b/packages/Keyguard/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2010 The Android Open Source Project
+# Copyright (C) 2013 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,7 +18,14 @@
LOCAL_SRC_FILES := $(call all-subdir-java-files) $(call all-subdir-Iaidl-files)
+LOCAL_JAVA_LIBRARIES := services
+
LOCAL_PACKAGE_NAME := Keyguard
+
LOCAL_CERTIFICATE := platform
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))