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

Commit ec4306ac authored by Michael Wright's avatar Michael Wright
Browse files

Log failures to unlinkToDeath wakelocks. 

Some wakelocks are throwing an exception when unlinking. This should be
impossible, so start catching and logging failures as WTFs so they get
uploaded when it happens again.

Fixes: 182841946
Bug: 180891878
Test: N/A
Change-Id: I9e7a0aa745852178cbfd793451e150e34e7b5488
parent 77a21b70

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);

        }

    }