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

am: e5a3ad23fd Change-Id: I5c95a68b758730839309d9c7fde0ecc6415b3f83
2016-11-30 09:24:30 +00:00
parent d644b89a35 e5a3ad23fd
commit 835932f4c5
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);
+        }
    }

    /**