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

Commit f94673a7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Pass correct realCallingUid to startActivity() if provided by... 

Merge "Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()"
parents 63322066 84d9ebd5

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

+3 −2
Original line number Diff line number Diff line
@@ -389,8 +389,9 @@ public final class PendingIntentRecord extends IIntentSender.Stub { 


                        if (key.allIntents != null && key.allIntents.length > 1) {

                            res = controller.mAtmInternal.startActivitiesInPackage(

                                    uid, key.packageName, allIntents, allResolvedTypes, resultTo,

                                    mergedOptions, userId, false /* validateIncomingUser */,

                                    uid, callingPid, callingUid, key.packageName, allIntents,

                                    allResolvedTypes, resultTo, mergedOptions, userId,

                                    false /* validateIncomingUser */,

                                    this /* originatingPendingIntent */,

                                    mAllowBgActivityStartsForActivitySender.contains(whitelistToken));

                        } else {

services/core/java/com/android/server/wm/ActivityStartController.java

+35 −6
Original line number Diff line number Diff line
@@ -300,6 +300,29 @@ public class ActivityStartController { 
            String[] resolvedTypes, IBinder resultTo, SafeActivityOptions options, int userId,

            boolean validateIncomingUser, PendingIntentRecord originatingPendingIntent,

            boolean allowBackgroundActivityStart) {

        return startActivitiesInPackage(uid, 0 /* realCallingPid */, -1 /* realCallingUid */,

            callingPackage, intents, resolvedTypes, resultTo, options, userId, validateIncomingUser,

            originatingPendingIntent, allowBackgroundActivityStart);

    }



    /**

     * Start intents as a package.

     *

     * @param uid Make a call as if this UID did.

     * @param realCallingPid PID of the real caller.

     * @param realCallingUid UID of the real caller.

     * @param callingPackage Make a call as if this package did.

     * @param intents Intents to start.

     * @param userId Start the intents on this user.

     * @param validateIncomingUser Set true to skip checking {@code userId} with the calling UID.

     * @param originatingPendingIntent PendingIntentRecord that originated this activity start or

     *        null if not originated by PendingIntent

     */

    final int startActivitiesInPackage(int uid, int realCallingPid, int realCallingUid,

            String callingPackage, Intent[] intents, String[] resolvedTypes, IBinder resultTo,

            SafeActivityOptions options, int userId, boolean validateIncomingUser,

            PendingIntentRecord originatingPendingIntent,

            boolean allowBackgroundActivityStart) {



        final String reason = "startActivityInPackage";
@@ -307,12 +330,14 @@ public class ActivityStartController { 
                Binder.getCallingUid(), reason);



        // TODO: Switch to user app stacks here.

        return startActivities(null, uid, callingPackage, intents, resolvedTypes, resultTo, options,

                userId, reason, originatingPendingIntent, allowBackgroundActivityStart);

        return startActivities(null, uid, realCallingPid, realCallingUid, callingPackage, intents,

                resolvedTypes, resultTo, options, userId, reason, originatingPendingIntent,

                allowBackgroundActivityStart);

    }



    int startActivities(IApplicationThread caller, int callingUid, String callingPackage,

            Intent[] intents, String[] resolvedTypes, IBinder resultTo, SafeActivityOptions options,

    int startActivities(IApplicationThread caller, int callingUid, int incomingRealCallingPid,

            int incomingRealCallingUid, String callingPackage, Intent[] intents,

            String[] resolvedTypes, IBinder resultTo, SafeActivityOptions options,

            int userId, String reason, PendingIntentRecord originatingPendingIntent,

            boolean allowBackgroundActivityStart) {

        if (intents == null) {
@@ -325,8 +350,12 @@ public class ActivityStartController { 
            throw new IllegalArgumentException("intents are length different than resolvedTypes");

        }



        final int realCallingPid = Binder.getCallingPid();

        final int realCallingUid = Binder.getCallingUid();

        final int realCallingPid = incomingRealCallingPid != 0

                ? incomingRealCallingPid

                : Binder.getCallingPid();

        final int realCallingUid = incomingRealCallingUid != -1

                ? incomingRealCallingUid

                : Binder.getCallingUid();



        int callingPid;

        if (callingUid >= 0) {

services/core/java/com/android/server/wm/ActivityStarter.java

+20 −13
Original line number Diff line number Diff line
@@ -294,6 +294,8 @@ class ActivityStarter { 
    private static class Request {

        private static final int DEFAULT_CALLING_UID = -1;

        private static final int DEFAULT_CALLING_PID = 0;

        static final int DEFAULT_REAL_CALLING_UID = -1;

        static final int DEFAULT_REAL_CALLING_PID = 0;



        IApplicationThread caller;

        Intent intent;
@@ -306,11 +308,11 @@ class ActivityStarter { 
        IBinder resultTo;

        String resultWho;

        int requestCode;

        int callingPid = DEFAULT_CALLING_UID;

        int callingUid = DEFAULT_CALLING_PID;

        int callingPid = DEFAULT_CALLING_PID;

        int callingUid = DEFAULT_CALLING_UID;

        String callingPackage;

        int realCallingPid;

        int realCallingUid;

        int realCallingPid = DEFAULT_REAL_CALLING_PID;

        int realCallingUid = DEFAULT_REAL_CALLING_UID;

        int startFlags;

        SafeActivityOptions activityOptions;

        boolean ignoreTargetSecurity;
@@ -365,8 +367,8 @@ class ActivityStarter { 
            callingPid = DEFAULT_CALLING_PID;

            callingUid = DEFAULT_CALLING_UID;

            callingPackage = null;

            realCallingPid = 0;

            realCallingUid = 0;

            realCallingPid = DEFAULT_REAL_CALLING_PID;

            realCallingUid = DEFAULT_REAL_CALLING_UID;

            startFlags = 0;

            activityOptions = null;

            ignoreTargetSecurity = false;
@@ -502,7 +504,8 @@ class ActivityStarter { 
            // for transactional diffs and preprocessing.

            if (mRequest.mayWait) {

                return startActivityMayWait(mRequest.caller, mRequest.callingUid,

                        mRequest.callingPackage, mRequest.intent, mRequest.resolvedType,

                        mRequest.callingPackage, mRequest.realCallingPid, mRequest.realCallingUid,

                        mRequest.intent, mRequest.resolvedType,

                        mRequest.voiceSession, mRequest.voiceInteractor, mRequest.resultTo,

                        mRequest.resultWho, mRequest.requestCode, mRequest.startFlags,

                        mRequest.profilerInfo, mRequest.waitResult, mRequest.globalConfig,
@@ -1092,10 +1095,10 @@ class ActivityStarter { 
    }



    private int startActivityMayWait(IApplicationThread caller, int callingUid,

            String callingPackage, Intent intent, String resolvedType,

            IVoiceInteractionSession voiceSession, IVoiceInteractor voiceInteractor,

            IBinder resultTo, String resultWho, int requestCode, int startFlags,

            ProfilerInfo profilerInfo, WaitResult outResult,

            String callingPackage, int requestRealCallingPid, int requestRealCallingUid,

            Intent intent, String resolvedType, IVoiceInteractionSession voiceSession,

            IVoiceInteractor voiceInteractor, IBinder resultTo, String resultWho, int requestCode,

            int startFlags, ProfilerInfo profilerInfo, WaitResult outResult,

            Configuration globalConfig, SafeActivityOptions options, boolean ignoreTargetSecurity,

            int userId, TaskRecord inTask, String reason,

            boolean allowPendingRemoteAnimationRegistryLookup,
@@ -1107,8 +1110,12 @@ class ActivityStarter { 
        mSupervisor.getActivityMetricsLogger().notifyActivityLaunching(intent);

        boolean componentSpecified = intent.getComponent() != null;



        final int realCallingPid = Binder.getCallingPid();

        final int realCallingUid = Binder.getCallingUid();

        final int realCallingPid = requestRealCallingPid != Request.DEFAULT_REAL_CALLING_PID

                ? requestRealCallingPid

                : Binder.getCallingPid();

        final int realCallingUid = requestRealCallingUid != Request.DEFAULT_REAL_CALLING_UID

                ? requestRealCallingUid

                : Binder.getCallingUid();



        int callingPid;

        if (callingUid >= 0) {

services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java

+6 −3
Original line number Diff line number Diff line
@@ -192,6 +192,8 @@ public abstract class ActivityTaskManagerInternal { 
     * Start intents as a package.

     *

     * @param uid Make a call as if this UID did.

     * @param realCallingPid PID of the real caller.

     * @param realCallingUid UID of the real caller.

     * @param callingPackage Make a call as if this package did.

     * @param intents Intents to start.

     * @param userId Start the intents on this user.
@@ -201,9 +203,10 @@ public abstract class ActivityTaskManagerInternal { 
     * @param allowBackgroundActivityStart Whether the background activity start should be allowed

     *        from originatingPendingIntent

     */

    public abstract int startActivitiesInPackage(int uid, String callingPackage, Intent[] intents,

            String[] resolvedTypes, IBinder resultTo, SafeActivityOptions options, int userId,

            boolean validateIncomingUser, PendingIntentRecord originatingPendingIntent,

    public abstract int startActivitiesInPackage(int uid, int realCallingPid, int realCallingUid,

            String callingPackage, Intent[] intents, String[] resolvedTypes, IBinder resultTo,

            SafeActivityOptions options, int userId, boolean validateIncomingUser,

            PendingIntentRecord originatingPendingIntent,

            boolean allowBackgroundActivityStart);



    public abstract int startActivityInPackage(int uid, int realCallingPid, int realCallingUid,

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+12 −9
Original line number Diff line number Diff line
@@ -957,9 +957,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        enforceNotIsolatedCaller(reason);

        userId = handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), userId, reason);

        // TODO: Switch to user app stacks here.

        return getActivityStartController().startActivities(caller, -1, callingPackage, intents,

                resolvedTypes, resultTo, SafeActivityOptions.fromBundle(bOptions), userId, reason,

                null /* originatingPendingIntent */, false /* allowBackgroundActivityStart */);

        return getActivityStartController().startActivities(caller, -1, 0, -1, callingPackage,

                intents, resolvedTypes, resultTo, SafeActivityOptions.fromBundle(bOptions), userId,

                reason, null /* originatingPendingIntent */,

                false /* allowBackgroundActivityStart */);

    }



    @Override
@@ -5827,14 +5828,16 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        }



        @Override

        public int startActivitiesInPackage(int uid, String callingPackage, Intent[] intents,

                String[] resolvedTypes, IBinder resultTo, SafeActivityOptions options, int userId,

                boolean validateIncomingUser, PendingIntentRecord originatingPendingIntent,

        public int startActivitiesInPackage(int uid, int realCallingPid, int realCallingUid,

                String callingPackage, Intent[] intents, String[] resolvedTypes, IBinder resultTo,

                SafeActivityOptions options, int userId, boolean validateIncomingUser,

                PendingIntentRecord originatingPendingIntent,

                boolean allowBackgroundActivityStart) {

            synchronized (mGlobalLock) {

                return getActivityStartController().startActivitiesInPackage(uid, callingPackage,

                        intents, resolvedTypes, resultTo, options, userId, validateIncomingUser,

                        originatingPendingIntent, allowBackgroundActivityStart);

                return getActivityStartController().startActivitiesInPackage(uid, realCallingPid,

                        realCallingUid, callingPackage, intents, resolvedTypes, resultTo, options,

                        userId, validateIncomingUser, originatingPendingIntent,

                        allowBackgroundActivityStart);

            }

        }