Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 15df815e1e

Change-Id: I51d74fee535d916c1c160d5e1fb68c350e6e4ef7
This commit is contained in:
Mark Lu
2016-11-30 09:19:26 +00:00
committed by android-build-merger
parent f3eef9a286 15df815e1e
commit e5a3ad23fd
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -2928,9 +2928,11 @@ public final class ActivityManagerService extends ActivityManagerNative
@Override @Override
public void batterySendBroadcast(Intent intent) { public void batterySendBroadcast(Intent intent) {
broadcastIntentLocked(null, null, intent, null, null, 0, null, null, null, synchronized (this) {
AppOpsManager.OP_NONE, null, false, false, broadcastIntentLocked(null, null, intent, null, null, 0, null, null, null,
-1, Process.SYSTEM_UID, UserHandle.USER_ALL); AppOpsManager.OP_NONE, null, false, false,
-1, Process.SYSTEM_UID, UserHandle.USER_ALL);
}
} }
/** /**