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

Commit 946a2249 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Ensure child task has activity type set" into tm-qpr-dev am: 54115fb7... 

Merge "Ensure child task has activity type set" into tm-qpr-dev am: 54115fb7 am: d68ab20b am: 07bb93e5 am: 23e563f5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21946201



Change-Id: I3b0e82415cca956e885f96c1ab53c2fa7d49b752
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04cb9c14 23e563f5

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

+6 −0
Original line number Diff line number Diff line
@@ -9074,6 +9074,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 


        final boolean wasInPictureInPicture = inPinnedWindowingMode();

        final DisplayContent display = mDisplayContent;

        final int activityType = getActivityType();

        if (wasInPictureInPicture && attachedToProcess() && display != null) {

            // If the PIP activity is changing to fullscreen with display orientation change, the

            // fixed rotation will take effect that requires to send fixed rotation adjustments
@@ -9098,6 +9099,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        } else {

            super.onConfigurationChanged(newParentConfig);

        }

        if (activityType != ACTIVITY_TYPE_UNDEFINED

                && activityType != getActivityType()) {

            Slog.w(TAG, "Can't change activity type once set: " + this

                    + " activityType=" + activityTypeToString(getActivityType()));

        }



        // Configuration's equality doesn't consider seq so if only seq number changes in resolved

        // override configuration. Therefore ConfigurationContainer doesn't change merged override

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

+3 −0
Original line number Diff line number Diff line
@@ -5781,8 +5781,11 @@ class Task extends TaskFragment { 
            final int taskId = activity != null

                    ? mTaskSupervisor.getNextTaskIdForUser(activity.mUserId)

                    : mTaskSupervisor.getNextTaskIdForUser();

            final int activityType = getActivityType();

            task = new Task.Builder(mAtmService)

                    .setTaskId(taskId)

                    .setActivityType(activityType != ACTIVITY_TYPE_UNDEFINED ? activityType

                            : ACTIVITY_TYPE_STANDARD)

                    .setActivityInfo(info)

                    .setActivityOptions(options)

                    .setIntent(intent)