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

am b079d1f2: am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"

Browse Source 
* commit 'b079d1f28089ad4de05162b7df0ace90bc40a5f3':
  Fixing services start order that impacts ICS - JB upgrade
This commit is contained in:
Amith Yamasani
2012-09-24 08:49:47 -07:00
committed by Android Git Automerger
parent a07cbb96f3 b079d1f280
commit 814f5ac3a1
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

@@ -693,6 +693,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();
@@ -734,11 +740,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;