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

Commit 559d8096 authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Only allow passing in calling pid/uid for SafeActivityOptions" into main

parents 7c324c5e 2567782f

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

+2 −1
Original line number Diff line number Diff line
@@ -157,7 +157,8 @@ public class PendingIntentController { 


            PendingIntentRecord.Key key = new PendingIntentRecord.Key(type, packageName, featureId,

                    token, resultWho, requestCode, intents, resolvedTypes, flags,

                    new SafeActivityOptions(opts), userId);

                    new SafeActivityOptions(opts, Binder.getCallingPid(), Binder.getCallingUid()),

                    userId);

            WeakReference<PendingIntentRecord> ref;

            ref = mIntentSenderRecords.get(key);

            PendingIntentRecord rec = ref != null ? ref.get() : null;

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

+2 −2
Original line number Diff line number Diff line
@@ -533,9 +533,9 @@ public final class PendingIntentRecord extends IIntentSender.Stub { 
            // Extract options before clearing calling identity

            mergedOptions = key.options;

            if (mergedOptions == null) {

                mergedOptions = new SafeActivityOptions(opts);

                mergedOptions = new SafeActivityOptions(opts, callingPid, callingUid);

            } else {

                mergedOptions.setCallerOptions(opts);

                mergedOptions.setCallerOptions(opts, callingPid, callingUid);

            }



            if (mAllowlistDuration != null) {

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

+4 −1
Original line number Diff line number Diff line
@@ -886,7 +886,10 @@ class ActivityClientController extends IActivityClientController.Stub { 


    @Override

    public boolean convertToTranslucent(IBinder token, Bundle options) {

        final SafeActivityOptions safeOptions = SafeActivityOptions.fromBundle(options);

        final int callingPid = Binder.getCallingPid();

        final int callingUid = Binder.getCallingUid();

        final SafeActivityOptions safeOptions = SafeActivityOptions.fromBundle(

                options, callingPid, callingUid);

        final long origId = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

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

+2 −1
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ public class ActivityStartController { 
                .setOutActivity(tmpOutRecord)

                .setCallingUid(0)

                .setActivityInfo(aInfo)

                .setActivityOptions(options.toBundle())

                .setActivityOptions(options.toBundle(),

                        Binder.getCallingPid(), Binder.getCallingUid())

                .execute();

        mLastHomeActivityStartRecord = tmpOutRecord[0];

        if (rootHomeTask.mInResumeTopActivity) {

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

+2 −2
Original line number Diff line number Diff line
@@ -3469,8 +3469,8 @@ class ActivityStarter { 
        return this;

    }



    ActivityStarter setActivityOptions(Bundle bOptions) {

        return setActivityOptions(SafeActivityOptions.fromBundle(bOptions));

    ActivityStarter setActivityOptions(Bundle bOptions, int callingPid, int callingUid) {

        return setActivityOptions(SafeActivityOptions.fromBundle(bOptions, callingPid, callingUid));

    }



    ActivityStarter setIgnoreTargetSecurity(boolean ignoreTargetSecurity) {