diff options
| -rwxr-xr-x | services/core/java/com/android/server/am/ActivityManagerService.java | 9 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 3f95ae2b3c49..36093c00f133 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -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()); diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 690b90a1f56e..48ed5ea6f120 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -2176,7 +2176,7 @@ public final class ActivityStackSupervisor implements DisplayListener { //mWindowManager.dump(); if (enableScreen) { - mService.enableScreenAfterBoot(); + mService.postEnableScreenAfterBootLocked(); } if (activityRemoved) { |