Merge "Fix batterySendBroadcast not synchronized issue." (15df815e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2928,10 +2928,12 @@ public final class ActivityManagerService extends ActivityManagerNative

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

	/**		/**
	* Initialize the application bind args. These are passed to each		* Initialize the application bind args. These are passed to each