am 888eb73c: resolved conflicts for merge of 814f5ac3 to jb-mr1-dev

* commit '888eb73c6e86a18520cbaa999a18e8b039dbed4f': Fixing services start order that impacts ICS - JB upgrade
2012-09-24 09:47:00 -07:00
parent 5d0f02d90c 888eb73c6e
commit ffdb4fb3f8
1 changed files with 6 additions and 6 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -768,6 +768,12 @@ class ServerThread extends Thread {
            reportWtf("making Vibrator Service ready", e);
        }

+        try {
+            lockSettings.systemReady();
+        } catch (Throwable e) {
+            reportWtf("making Lock Settings Service ready", e);
+        }
+
        if (devicePolicy != null) {
            try {
                devicePolicy.systemReady();
@@ -784,12 +790,6 @@ class ServerThread extends Thread {
            }
        }

-        try {
-            lockSettings.systemReady();
-        } catch (Throwable e) {
-            reportWtf("making Lock Settings Service ready", e);
-        }
-
        try {
            wm.systemReady();
        } catch (Throwable e) {