commit de9c48b3d1db099b58f9366029362a95ed2d50da
author Dianne Hackborn <hackbod@google.com> Fri Nov 20 14:49:59 2015 -0800
committer Dianne Hackborn <hackbod@google.com> Fri Nov 20 14:49:59 2015 -0800
tree efd48a91c8e378ccd5b880b5c8276c1e2904dc93
parent 67de49451e85a834e15b744e482039e18f8f02be

Fix issue #25779155: Random crash in the system server

Change-Id: I7c6ef4dcb9b88ca2d9b54010b2007b6bf88f9958

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

diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java
index 504a7ef..c5ce2fd 100644
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -2769,7 +2769,9 @@
         }
 
         @Override public void onUidIdle(int uid) throws RemoteException {
-            removeForStoppedLocked(uid);
+            synchronized (mLock) {
+                removeForStoppedLocked(uid);
+            }
         }
     };