commit 5017f2328407447002ab2d0cae1fe8ef87c50501
author Jason Simmons <jsimmons@google.com> Fri Jul 27 15:44:39 2012 -0700
committer Jason Simmons <jsimmons@google.com> Wed Aug 08 13:15:00 2012 -0700
tree 3e47a10c7c51935be5e134af19649d0b6c79985d
parent 86d09388ee1b98513de40dfff5de6e7c3b24cc07

Call systemReady on the lock settings before doing so on the window manager

At systemReady time, the window manager needs to obtain values from the lock
settings service (e.g. whether the lock screen is disabled).  During the
initial boot of a wiped device, the window manager was getting the wrong
values because LockSettingsService.systemReady/migrateOldData had not yet been
called.

Change-Id: I60825d0e4fad53a5b4349dabf9e5e299b863d0d0

(cherry pick of 2458abaf6676d5015af733c1010ecd67a085e9e2 from jb-aah-dev)

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 81f0733..96cf3d3 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -702,6 +702,12 @@
         }
 
         try {
+            lockSettings.systemReady();
+        } catch (Throwable e) {
+            reportWtf("making Lock Settings Service ready", e);
+        }
+
+        try {
             wm.systemReady();
         } catch (Throwable e) {
             reportWtf("making Window Manager Service ready", e);
@@ -726,11 +732,6 @@
         } catch (Throwable e) {
             reportWtf("making Package Manager Service ready", e);
         }
-        try {
-            lockSettings.systemReady();
-        } catch (Throwable e) {
-            reportWtf("making Lock Settings Service ready", e);
-        }
 
         // These are needed to propagate to the runnable below.
         final Context contextF = context;