Merge "Don't walk mutexed collections outside the mutex" into nyc-mr1-dev (b9c057c3) · Commits · e / os / android_frameworks_base

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.