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

Commit 3969cabf authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "If activity is an alias get maxRecents from target" into lmp-dev

parents 8afddbe7 8307ea70

core/java/android/content/pm/ActivityInfo.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -657,6 +657,7 @@ public class ActivityInfo extends ComponentInfo 
        softInputMode = orig.softInputMode;

        softInputMode = orig.softInputMode;

        uiOptions = orig.uiOptions;

        uiOptions = orig.uiOptions;

        parentActivityName = orig.parentActivityName;

        parentActivityName = orig.parentActivityName;

        maxRecents = orig.maxRecents;

    }

    }

    

    

    /**

    /**
@@ -728,6 +729,7 @@ public class ActivityInfo extends ComponentInfo 
        dest.writeInt(uiOptions);

        dest.writeInt(uiOptions);

        dest.writeString(parentActivityName);

        dest.writeString(parentActivityName);

        dest.writeInt(persistableMode);

        dest.writeInt(persistableMode);

        dest.writeInt(maxRecents);

    }

    }





    public static final Parcelable.Creator<ActivityInfo> CREATOR

    public static final Parcelable.Creator<ActivityInfo> CREATOR
@@ -754,5 +756,6 @@ public class ActivityInfo extends ComponentInfo 
        uiOptions = source.readInt();

        uiOptions = source.readInt();

        parentActivityName = source.readString();

        parentActivityName = source.readString();

        persistableMode = source.readInt();

        persistableMode = source.readInt();

        maxRecents = source.readInt();

    }

    }

}
 
}

core/java/android/content/pm/PackageParser.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -3308,6 +3308,7 @@ public class PackageParser { 
        info.softInputMode = target.info.softInputMode;

        info.softInputMode = target.info.softInputMode;

        info.uiOptions = target.info.uiOptions;

        info.uiOptions = target.info.uiOptions;

        info.parentActivityName = target.info.parentActivityName;

        info.parentActivityName = target.info.parentActivityName;

        info.maxRecents = target.info.maxRecents;





        Activity a = new Activity(mParseActivityAliasArgs, info);

        Activity a = new Activity(mParseActivityAliasArgs, info);

        if (outError[0] != null) {

        if (outError[0] != null) {