Merge "DisplayManagerService: remove unused support for onlyCore mode" (5f7ebe5a) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/DisplayManagerService.java

+2 −11

Original line number	Diff line number	Diff line
		@@ -243,10 +243,6 @@ public final class DisplayManagerService extends SystemService {
		// This option may disable certain display adapters.
		public boolean mSafeMode;

		// True if we are in a special boot mode where only core applications and
		// services should be started. This option may disable certain display adapters.
		public boolean mOnlyCore;

		// All callback records indexed by calling process id.
		public final SparseArray<CallbackRecord> mCallbacks =
		new SparseArray<CallbackRecord>();
		@@ -622,10 +618,9 @@ public final class DisplayManagerService extends SystemService {
		/**
		* Called when the system is ready to go.
		*/
		public void systemReady(boolean safeMode, boolean onlyCore) {
		public void systemReady(boolean safeMode) {
		synchronized (mSyncRoot) {
		mSafeMode = safeMode;
		mOnlyCore = onlyCore;
		mSystemReady = true;
		// Just in case the top inset changed before the system was ready. At this point, any
		// relevant configuration should be in place.
		@@ -1535,10 +1530,7 @@ public final class DisplayManagerService extends SystemService {
		// In safe mode, we disable non-essential display adapters to give the user
		// an opportunity to fix broken settings or other problems that might affect
		// system stability.
		// In only-core mode, we disable non-essential display adapters to minimize
		// the number of dependencies that are started while in this mode and to
		// prevent problems that might occur due to the device being encrypted.
		return !mSafeMode && !mOnlyCore;
		return !mSafeMode;
		}

		private void registerDisplayAdapterLocked(DisplayAdapter adapter) {
		@@ -2434,7 +2426,6 @@ public final class DisplayManagerService extends SystemService {
		pw.println("DISPLAY MANAGER (dumpsys display)");

		synchronized (mSyncRoot) {
		pw.println(" mOnlyCode=" + mOnlyCore);
		pw.println(" mSafeMode=" + mSafeMode);
		pw.println(" mPendingTraversal=" + mPendingTraversal);
		pw.println(" mViewports=" + mViewports);

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2694,8 +2694,8 @@ public final class SystemServer implements Dumpable {

		t.traceBegin("MakeDisplayManagerServiceReady");
		try {
		// TODO: use boot phase and communicate these flags some other way
		mDisplayManagerService.systemReady(safeMode, /* onlyCore= */ false);
		// TODO: use boot phase and communicate this flag some other way
		mDisplayManagerService.systemReady(safeMode);
		} catch (Throwable e) {
		reportWtf("making Display Manager Service ready", e);
		}

services/tests/servicestests/src/com/android/server/display/DisplayManagerServiceTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ public class DisplayManagerServiceTest {
		DisplayManagerService displayManager =
		new DisplayManagerService(mContext, mBasicInjector);
		registerDefaultDisplays(displayManager);
		displayManager.systemReady(false /* safeMode /, true / onlyCore */);
		displayManager.systemReady(false /* safeMode */);
		displayManager.windowManagerAndInputReady();

		// This is effectively the DisplayManager service published to ServiceManager.
		@@ -278,7 +278,7 @@ public class DisplayManagerServiceTest {
		DisplayManagerService displayManager =
		new DisplayManagerService(mContext, mBasicInjector);
		registerDefaultDisplays(displayManager);
		displayManager.systemReady(false /* safeMode /, true / onlyCore */);
		displayManager.systemReady(false /* safeMode */);
		displayManager.windowManagerAndInputReady();

		// This is effectively the DisplayManager service published to ServiceManager.