Merge "Must synchronize for ...Locked() code paths" into qt-dev

This commit is contained in:
TreeHugger Robot
2019-05-14 20:40:24 +00:00
committed by Android (Google) Code Review

View File

@@ -107,10 +107,12 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub {
EventLogTags.writeAmPreBoot(mUserId, componentName.getPackageName()); EventLogTags.writeAmPreBoot(mUserId, componentName.getPackageName());
mIntent.setComponent(componentName); mIntent.setComponent(componentName);
synchronized (mService) {
mService.broadcastIntentLocked(null, null, mIntent, null, this, 0, null, null, null, mService.broadcastIntentLocked(null, null, mIntent, null, this, 0, null, null, null,
AppOpsManager.OP_NONE, null, true, false, ActivityManagerService.MY_PID, AppOpsManager.OP_NONE, null, true, false, ActivityManagerService.MY_PID,
Process.SYSTEM_UID, Binder.getCallingUid(), Binder.getCallingPid(), mUserId); Process.SYSTEM_UID, Binder.getCallingUid(), Binder.getCallingPid(), mUserId);
} }
}
@Override @Override
public void performReceive(Intent intent, int resultCode, String data, Bundle extras, public void performReceive(Intent intent, int resultCode, String data, Bundle extras,