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

Commit c5aaf99d authored by Jeff Chang's avatar Jeff Chang
Browse files

[RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks 

The root task was created with null intent, but the intent,
resize mode and other information were updated from child tasks,
which sets the split-screen-secondary root task to unresizable.

This CL is back porting from f666e494 to prevent setting the
split-screen-secondary root task to unresizable.

Bug: 230435065
Bug: 185810717
Test: atest IntentTests
      atest ActivityStarterTests
      atest TaskRecordTests
      atest testSplitscreenPortraitAppOrientationRequests
Change-Id: I856d66371ac121f681958a7129527f18a5357d0f
parent 7ba3a378

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

+3 −10
Original line number Diff line number Diff line
@@ -961,27 +961,20 @@ class Task extends WindowContainer<WindowContainer> { 
            mCallingPackage = r.launchedFromPackage;

            mCallingFeatureId = r.launchedFromFeatureId;

            setIntent(intent != null ? intent : r.intent, info != null ? info : r.info);

            final WindowContainer parent = getParent();

            if (parent != null) {

                final Task t = parent.asTask();

                if (t != null) {

                    t.setIntent(r);

                }

            }

        }

        setLockTaskAuth(r);

    }



    /** Sets the original intent, _without_ updating the calling uid or package. */

    private void setIntent(Intent _intent, ActivityInfo info) {

        final boolean isLeaf = isLeafTask();

        if (!isLeafTask()) return;

        if (intent == null) {

            mNeverRelinquishIdentity = (info.flags & FLAG_RELINQUISH_TASK_IDENTITY) == 0;

        } else if (mNeverRelinquishIdentity && isLeaf) {

        } else if (mNeverRelinquishIdentity) {

            return;

        }



        affinity = isLeaf ? info.taskAffinity : null;

        affinity = info.taskAffinity;

        if (intent == null) {

            // If this task already has an intent associated with it, don't set the root

            // affinity -- we don't want it changing after initially set, but the initially