diff options
author | Amith Yamasani <yamasani@google.com> | 2012-09-24 08:49:47 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-24 08:49:47 -0700 |
commit | 814f5ac3a16a74c9b5e365ee5e70b9db245fd340 (patch) | |
tree | a0c599ccff2a3586018fb88d8cb9393ddab7d893 | |
parent | a07cbb96f34198b6cfda05d39a02c9220a9722cf (diff) | |
parent | b079d1f28089ad4de05162b7df0ace90bc40a5f3 (diff) | |
download | frameworks_base-814f5ac3a16a74c9b5e365ee5e70b9db245fd340.zip frameworks_base-814f5ac3a16a74c9b5e365ee5e70b9db245fd340.tar.gz frameworks_base-814f5ac3a16a74c9b5e365ee5e70b9db245fd340.tar.bz2 |
am b079d1f2: am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"
* commit 'b079d1f28089ad4de05162b7df0ace90bc40a5f3':
Fixing services start order that impacts ICS - JB upgrade
-rw-r--r-- | services/java/com/android/server/SystemServer.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index e55e7fe..2676537 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -693,6 +693,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(); @@ -734,11 +740,6 @@ class ServerThread extends Thread { } 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; |