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

Commit 970cc6f3 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge \"Don\'t walk mutexed collections outside the mutex\" into nyc-mr1-dev 

am: b9c057c3

Change-Id: I51a2f7324e96327a1d5e2f826544f03309412081
parents 6e78e3a9 b9c057c3

services/core/java/com/android/server/AlarmManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -2547,11 +2547,13 @@ class AlarmManagerService extends SystemService { 
                } else {

                    // Just in case -- even though no wakeup flag was set, make sure

                    // we have updated the kernel to the next alarm time.

                    synchronized (mLock) {

                        rescheduleKernelAlarmsLocked();

                    }

                }

            }

        }

    }



    /**

     * Attribute blame for a WakeLock.