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

Commit efd18370 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Allow Bluetooth to use privapp_allowlist"

parents 3b343c6c e3f31cfd
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -289,7 +289,13 @@ func (a *AndroidApp) OverridablePropertiesDepsMutator(ctx android.BottomUpMutato
	}

	if a.appProperties.Privapp_allowlist != nil && !Bool(a.appProperties.Privileged) {
		ctx.PropertyErrorf("privapp_allowlist", "privileged must be set in order to use privapp_allowlist")
		// There are a few uids that are explicitly considered privileged regardless of their
		// app's location. Bluetooth is one such app. It should arguably be moved to priv-app,
		// but for now, allow it not to be in priv-app.
		privilegedBecauseOfUid := ctx.ModuleName() == "Bluetooth"
		if !privilegedBecauseOfUid {
			ctx.PropertyErrorf("privapp_allowlist", "privileged must be set in order to use privapp_allowlist (with a few exceptions)")
		}
	}

	for _, cert := range a.appProperties.Additional_certificates {