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

Commit 18ffcb29 authored by Achim Thesmann's avatar Achim Thesmann Committed by Automerger Merge Worker
Browse files

Merge "Prevent race condition" into udc-dev am: 0ab1c83c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623639



Change-Id: Id08cbf479026423a86446970659b33d99554f96f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48347e02 0ab1c83c

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

+4 −3
Original line number Diff line number Diff line
@@ -1076,12 +1076,13 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN 
        if (app == null) {

            return;

        }

        if (mBackgroundStartPrivilegesByStartMerged.allowsAny()

                || mIsAllowedBgActivityStartsByBinding) {

        BackgroundStartPrivileges backgroundStartPrivileges =

                getBackgroundStartPrivilegesWithExclusiveToken();

        if (backgroundStartPrivileges.allowsAny()) {

            // if the token is already there it's safe to "re-add it" - we're dealing with

            // a set of Binder objects

            app.addOrUpdateBackgroundStartPrivileges(this,

                    getBackgroundStartPrivilegesWithExclusiveToken());

                    backgroundStartPrivileges);

        } else {

            app.removeBackgroundStartPrivileges(this);

        }