Merge "Maybe fix issue #2881233: reboot loop at boot on stingray" (d4e60a1f) · Commits · e / os / android_frameworks_base

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -475,8 +475,6 @@ class ServerThread extends Thread {
	} catch (RemoteException e) {		} catch (RemoteException e) {
	}		}

	wm.initDisplay();

	// These are needed to propagate to the runnable below.		// These are needed to propagate to the runnable below.
	final StatusBarManagerService statusBarF = statusBar;		final StatusBarManagerService statusBarF = statusBar;
	final BatteryService batteryF = battery;		final BatteryService batteryF = battery;

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -5529,10 +5529,6 @@ public class WindowManagerService extends IWindowManager.Stub
	}		}

	public void systemReady() {		public void systemReady() {
	mPolicy.systemReady();
	}

	public void initDisplay() {
	synchronized(mWindowMap) {		synchronized(mWindowMap) {
	if (mDisplay != null) {		if (mDisplay != null) {
	throw new IllegalStateException("Display already initialized");		throw new IllegalStateException("Display already initialized");
	@@ -5548,6 +5544,8 @@ public class WindowManagerService extends IWindowManager.Stub
	mActivityManager.updateConfiguration(null);		mActivityManager.updateConfiguration(null);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	}		}

			mPolicy.systemReady();
	}		}

	// -------------------------------------------------------------		// -------------------------------------------------------------