Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing services start order that impacts ICS - JB upgrade"

Browse Source
This commit is contained in:
Amith Yamasani
2012-09-23 16:01:52 -07:00
committed by Gerrit Code Review
parent ab12f0f72c f35df5b509
commit 5e8cbdc0bd
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/java/com/android/server/SystemServer.java
View File

@@ -677,6 +677,12 @@ class ServerThread extends Thread {
reportWtf("making Vibrator Service ready", e); reportWtf("making Vibrator Service ready", e);
} }
try {
lockSettings.systemReady();
} catch (Throwable e) {
reportWtf("making Lock Settings Service ready", e);
}
if (devicePolicy != null) { if (devicePolicy != null) {
try { try {
devicePolicy.systemReady(); devicePolicy.systemReady();
@@ -718,11 +724,6 @@ class ServerThread extends Thread {
} catch (Throwable e) { } catch (Throwable e) {
reportWtf("making Package Manager Service ready", 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. // These are needed to propagate to the runnable below.
final Context contextF = context; final Context contextF = context;