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

am: 5f5020d42e

Change-Id: I8e0422d6858b734cab89e8721654ac0a441f201b
This commit is contained in:
Christopher Tate
2019-05-14 13:51:59 -07:00
committed by android-build-merger

View File

@@ -107,9 +107,11 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub {
EventLogTags.writeAmPreBoot(mUserId, componentName.getPackageName());
mIntent.setComponent(componentName);
mService.broadcastIntentLocked(null, null, mIntent, null, this, 0, null, null, null,
AppOpsManager.OP_NONE, null, true, false, ActivityManagerService.MY_PID,
Process.SYSTEM_UID, Binder.getCallingUid(), Binder.getCallingPid(), mUserId);
synchronized (mService) {
mService.broadcastIntentLocked(null, null, mIntent, null, this, 0, null, null, null,
AppOpsManager.OP_NONE, null, true, false, ActivityManagerService.MY_PID,
Process.SYSTEM_UID, Binder.getCallingUid(), Binder.getCallingPid(), mUserId);
}
}
@Override