Merge "Fix batterySendBroadcast not synchronized issue." am: 32e756a4bc

am: 15df815e1e Change-Id: I51d74fee535d916c1c160d5e1fb68c350e6e4ef7
2016-11-30 09:19:26 +00:00
parent f3eef9a286 15df815e1e
commit e5a3ad23fd
1 changed files with 5 additions and 3 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -2928,9 +2928,11 @@ public final class ActivityManagerService extends ActivityManagerNative

    @Override
    public void batterySendBroadcast(Intent intent) {
-        broadcastIntentLocked(null, null, intent, null, null, 0, null, null, null,
-                AppOpsManager.OP_NONE, null, false, false,
-                -1, Process.SYSTEM_UID, UserHandle.USER_ALL);
+        synchronized (this) {
+            broadcastIntentLocked(null, null, intent, null, null, 0, null, null, null,
+                    AppOpsManager.OP_NONE, null, false, false,
+                    -1, Process.SYSTEM_UID, UserHandle.USER_ALL);
+        }
    }

    /**