Merge "Merge "Prevent race condition" into udc-dev am: 0ab1c83c1c am:... (170aade2) · Commits · e / os / android_frameworks_base

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);
		}