diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-09-24 08:45:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-24 08:45:14 -0700 |
| commit | b079d1f28089ad4de05162b7df0ace90bc40a5f3 (patch) | |
| tree | 941d8248b5433729af381323fe74e8d0c1518738 /services/java/com/android/server/SystemServer.java | |
| parent | 56fd88d87ff607f65a963b5500b27ae3d4d2670e (diff) | |
| parent | 5e8cbdc0bd6dfc51e6b54db1d5fd61347336d862 (diff) | |
| download | frameworks_base-b079d1f28089ad4de05162b7df0ace90bc40a5f3.zip frameworks_base-b079d1f28089ad4de05162b7df0ace90bc40a5f3.tar.gz frameworks_base-b079d1f28089ad4de05162b7df0ace90bc40a5f3.tar.bz2 | |
am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"
* commit '5e8cbdc0bd6dfc51e6b54db1d5fd61347336d862':
Fixing services start order that impacts ICS - JB upgrade
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -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; |