Merge "Fix batterySendBroadcast not synchronized issue."

am: 32e756a4bc Change-Id: Ieab665e92bdb17c449c82de66604fbef5688de17
2016-11-30 09:14:31 +00:00
parent b9d8535a21 32e756a4bc
commit 15df815e1e
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);
+        }
    }

    /**