Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab26c9e0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Log failures to unlinkToDeath wakelocks." into sc-dev am: 0fa71fcc 

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

Change-Id: I482de4133a08cb1bec3e5f5baf30fac1ed3dd4ac
parents a9da2701 0fa71fcc

services/core/java/com/android/server/power/PowerManagerService.java

+6 −1
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ import java.lang.annotation.RetentionPolicy; 
import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.NoSuchElementException;

import java.util.Objects;



/**
@@ -1490,7 +1491,11 @@ public final class PowerManagerService extends SystemService 
                mRequestWaitForNegativeProximity = true;

            }



            try {

                wakeLock.mLock.unlinkToDeath(wakeLock, 0);

            } catch (NoSuchElementException e) {

                Slog.wtf(TAG, "Failed to unlink wakelock", e);

            }

            removeWakeLockLocked(wakeLock, index);

        }

    }