Do not use filter calling uid parameter originally intended for insta…

…nt apps
GrapheneOS-Archive · May 3, 2024 · f408254 · f408254
1 parent 5af848e
commit f408254
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -495,7 +495,6 @@ void set(@NonNull Request request) {
             avoidMoveToFront = request.avoidMoveToFront;
             allowPendingRemoteAnimationRegistryLookup
                     = request.allowPendingRemoteAnimationRegistryLookup;
-            filterCallingUid = request.filterCallingUid;
             originatingPendingIntent = request.originatingPendingIntent;
             forcedBalByPiSender = request.forcedBalByPiSender;
             errorCallbackToken = request.errorCallbackToken;
@@ -1458,9 +1457,7 @@ void postStartActivityProcessing(ActivityRecord r, int result,
      */
     static int computeResolveFilterUid(int customCallingUid, int actualCallingUid,
             int filterCallingUid) {
-        return filterCallingUid != UserHandle.USER_NULL
-                ? filterCallingUid
-                : (customCallingUid >= 0 ? customCallingUid : actualCallingUid);
+        return customCallingUid >= 0 ? customCallingUid : actualCallingUid;
     }
 
     /**
@@ -3162,11 +3159,6 @@ ActivityStarter setIgnoreTargetSecurity(boolean ignoreTargetSecurity) {
         return this;
     }
 
-    ActivityStarter setFilterCallingUid(int filterCallingUid) {
-        mRequest.filterCallingUid = filterCallingUid;
-        return this;
-    }
-
     ActivityStarter setComponentSpecified(boolean componentSpecified) {
         mRequest.componentSpecified = componentSpecified;
         return this;

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -1681,7 +1681,6 @@ public final int startActivityAsCaller(IApplicationThread caller, String calling
                     .setActivityOptions(createSafeActivityOptionsWithBalAllowed(bOptions))
                     .setUserId(userId)
                     .setIgnoreTargetSecurity(ignoreTargetSecurity)
-                    .setFilterCallingUid(isResolver ? 0 /* system */ : targetUid)
                     // The target may well be in the background, which would normally prevent it
                     // from starting an activity. Here we definitely want the start to succeed.
                     .setBackgroundStartPrivileges(BackgroundStartPrivileges.ALLOW_BAL)