Allow INTERACT_ACROSS_USERS for service access.
But only if the two users are in the same profile. Also
apply the same rule for the recently allowed interaction
across content providers.
The activity manager now keeps track of which users are in
the same profile group, and the handleIncomingUser function has
an option to allow a non-full caller to do the interaction
if the two users are in the same profile group.
Spread this joy all over the place.
Also turn off multi-user on Svelte devices.
Change-Id: I231484ea2a6bfccbb3cd51357d7a387bd75039ea
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 65afd71..f095c68 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -3407,7 +3407,8 @@
public final int startActivity(Intent intent) {
mService.enforceNotIsolatedCaller("ActivityContainer.startActivity");
int userId = mService.handleIncomingUser(Binder.getCallingPid(),
- Binder.getCallingUid(), mCurrentUser, false, true, "ActivityContainer", null);
+ Binder.getCallingUid(), mCurrentUser, false,
+ ActivityManagerService.ALLOW_FULL_ONLY, "ActivityContainer", null);
// TODO: Switch to user app stacks here.
intent.addFlags(FORCE_NEW_TASK_FLAGS);
String mimeType = intent.getType();
@@ -3433,7 +3434,8 @@
private void checkEmbeddedAllowedInner(Intent intent, String resolvedType) {
int userId = mService.handleIncomingUser(Binder.getCallingPid(),
- Binder.getCallingUid(), mCurrentUser, false, true, "ActivityContainer", null);
+ Binder.getCallingUid(), mCurrentUser, false,
+ ActivityManagerService.ALLOW_FULL_ONLY, "ActivityContainer", null);
if (resolvedType == null) {
resolvedType = intent.getType();
if (resolvedType == null && intent.getData() != null