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

Merge "Log failures to unlinkToDeath wakelocks." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-14 01:42:41 +00:00
committed by Android (Google) Code Review
parent ddaf6b4117 ec4306ac39
commit 0fa71fccb5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,6 +129,7 @@ import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.NoSuchElementException;
import java.util.Objects; import java.util.Objects;
/** /**
@@ -1490,7 +1491,11 @@ public final class PowerManagerService extends SystemService
mRequestWaitForNegativeProximity = true; mRequestWaitForNegativeProximity = true;
} }
wakeLock.mLock.unlinkToDeath(wakeLock, 0); try {
wakeLock.mLock.unlinkToDeath(wakeLock, 0);
} catch (NoSuchElementException e) {
Slog.wtf(TAG, "Failed to unlink wakelock", e);
}
removeWakeLockLocked(wakeLock, index); removeWakeLockLocked(wakeLock, index);
} }
} }