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

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

Merge "Move new changes to ParsingPackageUtils" into sc-dev

parents 19874183 ed537a2a

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

+0 −1
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ public class PackageParser { 
    public static final String METADATA_SUPPORTS_SIZE_CHANGES = "android.supports_size_changes";

    public static final String METADATA_ACTIVITY_WINDOW_LAYOUT_AFFINITY =

            "android.activity_window_layout_affinity";

    public static final String METADATA_ACTIVITY_LAUNCH_MODE = "android.activity.launch_mode";



    /**

     * Bit mask of all the valid bits that can be set in recreateOnConfigChanges.

core/java/android/content/pm/parsing/ParsingPackageUtils.java

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ public class ParsingPackageUtils { 
    public static final String METADATA_SUPPORTS_SIZE_CHANGES = "android.supports_size_changes";

    public static final String METADATA_ACTIVITY_WINDOW_LAYOUT_AFFINITY =

            "android.activity_window_layout_affinity";

    public static final String METADATA_ACTIVITY_LAUNCH_MODE = "android.activity.launch_mode";



    public static final int SDK_VERSION = Build.VERSION.SDK_INT;

    public static final String[] SDK_CODENAMES = Build.VERSION.ACTIVE_CODENAMES;

core/java/android/content/pm/parsing/component/ParsedActivityUtils.java

+2 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.annotation.NonNull; 
import android.app.ActivityTaskManager;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.pm.PackageParser;

import android.content.pm.parsing.ParsingPackage;

import android.content.pm.parsing.ParsingPackageUtils;

import android.content.pm.parsing.ParsingUtils;
@@ -414,9 +413,9 @@ public class ParsedActivityUtils { 


        if (!isAlias && activity.launchMode != LAUNCH_SINGLE_INSTANCE_PER_TASK

                && activity.metaData != null && activity.metaData.containsKey(

                PackageParser.METADATA_ACTIVITY_LAUNCH_MODE)) {

                ParsingPackageUtils.METADATA_ACTIVITY_LAUNCH_MODE)) {

            final String launchMode = activity.metaData.getString(

                    PackageParser.METADATA_ACTIVITY_LAUNCH_MODE);

                    ParsingPackageUtils.METADATA_ACTIVITY_LAUNCH_MODE);

            if (launchMode != null && launchMode.equals("singleInstancePerTask")) {

                activity.launchMode = LAUNCH_SINGLE_INSTANCE_PER_TASK;

            }