resolved conflicts for merge of 814f5ac3 to jb-mr1-dev (888eb73c) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -768,6 +768,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();
		@@ -784,12 +790,6 @@ class ServerThread extends Thread {
		}
		}

		try {
		lockSettings.systemReady();
		} catch (Throwable e) {
		reportWtf("making Lock Settings Service ready", e);
		}

		try {
		wm.systemReady();
		} catch (Throwable e) {