Merge "Fixing services start order that impacts ICS - JB upgrade" (5e8cbdc0) · Commits · e / os / android_frameworks_base

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -677,6 +677,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();
		@@ -718,11 +724,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;