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

Commit 7b5b7cb6 authored by Christopher Tate's avatar Christopher Tate
Browse files

Don't walk mutexed collections outside the mutex 

In particular, don't call rescheduleKernelAlarmsLocked() without
the lock held, or Bad Things will happen.

Bug 29931253

Change-Id: I93a7f16d543b5af2adff27f949a68f3d54169285
parent 07e234c9

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.