Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev (f0f0f7ca) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -1159,6 +1159,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		static final int SYSTEM_USER_START_MSG = 42;
		static final int SYSTEM_USER_CURRENT_MSG = 43;
		static final int ENTER_ANIMATION_COMPLETE_MSG = 44;
		static final int ENABLE_SCREEN_AFTER_BOOT_MSG = 45;

		static final int FIRST_ACTIVITY_STACK_MSG = 100;
		static final int FIRST_BROADCAST_QUEUE_MSG = 200;
		@@ -1826,6 +1827,10 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		break;
		}
		case ENABLE_SCREEN_AFTER_BOOT_MSG: {
		enableScreenAfterBoot();
		break;
		}
		}
		}
		};
		@@ -5525,6 +5530,10 @@ public final class ActivityManagerService extends ActivityManagerNative
		Binder.restoreCallingIdentity(origId);
		}

		void postEnableScreenAfterBootLocked() {
		mHandler.sendEmptyMessage(ENABLE_SCREEN_AFTER_BOOT_MSG);
		}

		void enableScreenAfterBoot() {
		EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_ENABLE_SCREEN,
		SystemClock.uptimeMillis());

+1 −1

Original line number	Diff line number	Diff line
		@@ -2176,7 +2176,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
		//mWindowManager.dump();

		if (enableScreen) {
		mService.enableScreenAfterBoot();
		mService.postEnableScreenAfterBootLocked();
		}

		if (activityRemoved) {