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

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

Merge "Fixed build breakage"

parents 9a43f654 eea34ee9

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -265,7 +265,7 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi 
    /** Indication of what to run next when task exits. */

    /** Indication of what to run next when task exits. */

    // TODO: Shouldn't be needed if we have things in visual order. I.e. we stop using stacks or

    // TODO: Shouldn't be needed if we have things in visual order. I.e. we stop using stacks or

    // have a stack per standard application type...

    // have a stack per standard application type...

    @WindowConfiguration.ActivityType

    /*@WindowConfiguration.ActivityType*/

    private int mTaskToReturnTo = ACTIVITY_TYPE_STANDARD;

    private int mTaskToReturnTo = ACTIVITY_TYPE_STANDARD;





    /** If original intent did not allow relinquishing task identity, save that information */

    /** If original intent did not allow relinquishing task identity, save that information */
@@ -887,7 +887,7 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi 
        return this.intent.filterEquals(intent);

        return this.intent.filterEquals(intent);

    }

    }





    void setTaskToReturnTo(@WindowConfiguration.ActivityType int taskToReturnTo) {

    void setTaskToReturnTo(/*@WindowConfiguration.ActivityType*/ int taskToReturnTo) {

        mTaskToReturnTo = taskToReturnTo == ACTIVITY_TYPE_RECENTS

        mTaskToReturnTo = taskToReturnTo == ACTIVITY_TYPE_RECENTS

                ? ACTIVITY_TYPE_HOME : taskToReturnTo;

                ? ACTIVITY_TYPE_HOME : taskToReturnTo;

    }

    }
@@ -1142,7 +1142,7 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi 
    }

    }





    @Override

    @Override

    @WindowConfiguration.ActivityType

    /*@WindowConfiguration.ActivityType*/

    public int getActivityType() {

    public int getActivityType() {

        final int applicationType = super.getActivityType();

        final int applicationType = super.getActivityType();

        if (applicationType != ACTIVITY_TYPE_UNDEFINED || mActivities.isEmpty()) {

        if (applicationType != ACTIVITY_TYPE_UNDEFINED || mActivities.isEmpty()) {

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -130,20 +130,20 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { 
    }

    }





    /** Sets the windowing mode for the configuration container. */

    /** Sets the windowing mode for the configuration container. */

    public void setWindowingMode(@WindowConfiguration.WindowingMode int windowingMode) {

    public void setWindowingMode(/*@WindowConfiguration.WindowingMode*/ int windowingMode) {

        mTmpConfig.setTo(getOverrideConfiguration());

        mTmpConfig.setTo(getOverrideConfiguration());

        mTmpConfig.windowConfiguration.setWindowingMode(windowingMode);

        mTmpConfig.windowConfiguration.setWindowingMode(windowingMode);

        onOverrideConfigurationChanged(mTmpConfig);

        onOverrideConfigurationChanged(mTmpConfig);

    }

    }





    /** Returns the activity type associated with the the configuration container. */

    /** Returns the activity type associated with the the configuration container. */

    @WindowConfiguration.ActivityType

    /*@WindowConfiguration.ActivityType*/

    public int getActivityType() {

    public int getActivityType() {

        return mFullConfiguration.windowConfiguration.getActivityType();

        return mFullConfiguration.windowConfiguration.getActivityType();

    }

    }





    /** Sets the activity type to associate with the configuration container. */

    /** Sets the activity type to associate with the configuration container. */

    public void setActivityType(@WindowConfiguration.ActivityType int activityType) {

    public void setActivityType(/*@WindowConfiguration.ActivityType*/ int activityType) {

        int currentActivityType = getActivityType();

        int currentActivityType = getActivityType();

        if (currentActivityType == activityType) {

        if (currentActivityType == activityType) {

            return;

            return;
@@ -174,8 +174,8 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { 
    }

    }





    public boolean hasCompatibleActivityType(ConfigurationContainer other) {

    public boolean hasCompatibleActivityType(ConfigurationContainer other) {

        @WindowConfiguration.ActivityType int thisType = getActivityType();

        /*@WindowConfiguration.ActivityType*/ int thisType = getActivityType();

        @WindowConfiguration.ActivityType int otherType = other.getActivityType();

        /*@WindowConfiguration.ActivityType*/ int otherType = other.getActivityType();





        return thisType == otherType

        return thisType == otherType

                || thisType == ACTIVITY_TYPE_UNDEFINED

                || thisType == ACTIVITY_TYPE_UNDEFINED