Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove double-locking from PowerManagerService.onBootPhase" into tm-dev am: 1d609047f8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047524

Change-Id: I1e0c6eecdc095bc611fd7674d9f77fe6dffa5d58
This commit is contained in:
TreeHugger Robot
2022-03-02 02:45:10 +00:00
committed by Automerger Merge Worker
parent 3d992011cd 1d609047f8
commit 3adb6db87f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -1176,7 +1176,6 @@ public final class PowerManagerService extends SystemService
@Override @Override
public void onBootPhase(int phase) { public void onBootPhase(int phase) {
synchronized (mLock) {
if (phase == PHASE_SYSTEM_SERVICES_READY) { if (phase == PHASE_SYSTEM_SERVICES_READY) {
systemReady(); systemReady();
@@ -1184,6 +1183,7 @@ public final class PowerManagerService extends SystemService
incrementBootCount(); incrementBootCount();
} else if (phase == PHASE_BOOT_COMPLETED) { } else if (phase == PHASE_BOOT_COMPLETED) {
synchronized (mLock) {
final long now = mClock.uptimeMillis(); final long now = mClock.uptimeMillis();
mBootCompleted = true; mBootCompleted = true;
mDirty |= DIRTY_BOOT_COMPLETED; mDirty |= DIRTY_BOOT_COMPLETED;