Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1d120a4 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

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

am: 5f5020d4

Change-Id: I8e0422d6858b734cab89e8721654ac0a441f201b
parents 69cd215a 5f5020d4

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

+5 −3
Original line number Diff line number Diff line
@@ -107,10 +107,12 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub { 
        EventLogTags.writeAmPreBoot(mUserId, componentName.getPackageName());



        mIntent.setComponent(componentName);

        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

    public void performReceive(Intent intent, int resultCode, String data, Bundle extras,