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

Commit 966d4e03 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Ensure the activity type is set to the activity" into udc-dev am: b255015e am: 1f1f185b 

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



Change-Id: I7ac9de6f53fcab962e3a9ee382caf923b8b7f430
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1bd62e33 1f1f185b

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

+7 −2
Original line number Diff line number Diff line
@@ -9060,8 +9060,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

        if (activityType != ACTIVITY_TYPE_UNDEFINED

                && activityType != getActivityType()) {

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

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

            final String errorMessage = "Can't change activity type once set: " + this

                    + " activityType=" + activityTypeToString(getActivityType()) + ", was "

                    + activityTypeToString(activityType);

            if (Build.IS_DEBUGGABLE) {

                throw new IllegalStateException(errorMessage);

            }

            Slog.w(TAG, errorMessage);

        }



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

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

+12 −6
Original line number Diff line number Diff line
@@ -1450,14 +1450,22 @@ class Task extends TaskFragment { 


        // Only set this based on the first activity

        if (!hadActivity) {

            if (r.getActivityType() == ACTIVITY_TYPE_UNDEFINED) {

            int activityOverrideType =

                    r.getRequestedOverrideConfiguration().windowConfiguration.getActivityType();

            if (activityOverrideType == ACTIVITY_TYPE_UNDEFINED) {

                // Normally non-standard activity type for the activity record will be set when the

                // object is created, however we delay setting the standard application type until

                // this point so that the task can set the type for additional activities added in

                // the else condition below.

                r.setActivityType(ACTIVITY_TYPE_STANDARD);

            }

            setActivityType(r.getActivityType());

                activityOverrideType = activityType != ACTIVITY_TYPE_UNDEFINED ? activityType

                        : ACTIVITY_TYPE_STANDARD;

                // Set the Activity's requestedOverrideConfiguration directly to reduce

                // WC#onConfigurationChanged calls since it will be called while setting the

                // Task's activity type below.

                r.getRequestedOverrideConfiguration().windowConfiguration.setActivityType(

                        activityOverrideType);

            }

            setActivityType(activityOverrideType);

            isPersistable = r.isPersistable();

            mCallingUid = r.launchedFromUid;

            mCallingPackage = r.launchedFromPackage;
@@ -5799,8 +5807,6 @@ class Task extends TaskFragment { 
            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)