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

Commit 3bf1dc68 authored by Jackal Guo's avatar Jackal Guo Committed by Android (Google) Code Review
Browse files

Merge changes I91a61b38,Ia7e4e035 

* changes:
  Convert Integer/Float/Boolean to primitive types
  Using float instead of Float in ParsedActivity
parents dab94ba4 ee5b44c8

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

+5 −4
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package android.content.pm;

package android.content.pm;





import android.annotation.FloatRange;

import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.TestApi;

import android.annotation.TestApi;

import android.app.Activity;

import android.app.Activity;
@@ -1368,8 +1369,8 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
    }

    }





    /** @hide */

    /** @hide */

    public void setMaxAspectRatio(float maxAspectRatio) {

    public void setMaxAspectRatio(@FloatRange(from = 0f) float maxAspectRatio) {

        this.mMaxAspectRatio = maxAspectRatio;

        this.mMaxAspectRatio = maxAspectRatio >= 0f ? maxAspectRatio : 0f;

    }

    }





    /** @hide */

    /** @hide */
@@ -1378,8 +1379,8 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
    }

    }





    /** @hide */

    /** @hide */

    public void setMinAspectRatio(float minAspectRatio) {

    public void setMinAspectRatio(@FloatRange(from = 0f) float minAspectRatio) {

        this.mMinAspectRatio = minAspectRatio;

        this.mMinAspectRatio = minAspectRatio >= 0f ? minAspectRatio : 0f;

    }

    }





    /**

    /**

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -531,10 +531,8 @@ public class PackageInfoWithoutStateUtils { 
        ai.lockTaskLaunchMode = a.getLockTaskLaunchMode();

        ai.lockTaskLaunchMode = a.getLockTaskLaunchMode();

        ai.screenOrientation = a.getScreenOrientation();

        ai.screenOrientation = a.getScreenOrientation();

        ai.resizeMode = a.getResizeMode();

        ai.resizeMode = a.getResizeMode();

        Float maxAspectRatio = a.getMaxAspectRatio();

        ai.setMaxAspectRatio(a.getMaxAspectRatio());

        ai.setMaxAspectRatio(maxAspectRatio != null ? maxAspectRatio : 0f);

        ai.setMinAspectRatio(a.getMinAspectRatio());

        Float minAspectRatio = a.getMinAspectRatio();

        ai.setMinAspectRatio(minAspectRatio != null ? minAspectRatio : 0f);

        ai.supportsSizeChanges = a.isSupportsSizeChanges();

        ai.supportsSizeChanges = a.isSupportsSizeChanges();

        ai.requestedVrComponent = a.getRequestedVrComponent();

        ai.requestedVrComponent = a.getRequestedVrComponent();

        ai.rotationAnimation = a.getRotationAnimation();

        ai.rotationAnimation = a.getRotationAnimation();

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -150,6 +150,7 @@ public class ParsingPackageUtils { 
    public static final boolean DEBUG_JAR = false;

    public static final boolean DEBUG_JAR = false;

    public static final boolean DEBUG_BACKUP = false;

    public static final boolean DEBUG_BACKUP = false;

    public static final float DEFAULT_PRE_O_MAX_ASPECT_RATIO = 1.86f;

    public static final float DEFAULT_PRE_O_MAX_ASPECT_RATIO = 1.86f;

    public static final float ASPECT_RATIO_NOT_SET = -1f;





    /** File name in an APK for the Android manifest. */

    /** File name in an APK for the Android manifest. */

    public static final String ANDROID_MANIFEST_FILENAME = "AndroidManifest.xml";

    public static final String ANDROID_MANIFEST_FILENAME = "AndroidManifest.xml";
@@ -2096,7 +2097,7 @@ public class ParsingPackageUtils { 
            pkg.setGwpAsanMode(sa.getInt(R.styleable.AndroidManifestApplication_gwpAsanMode, -1));

            pkg.setGwpAsanMode(sa.getInt(R.styleable.AndroidManifestApplication_gwpAsanMode, -1));

            pkg.setMemtagMode(sa.getInt(R.styleable.AndroidManifestApplication_memtagMode, -1));

            pkg.setMemtagMode(sa.getInt(R.styleable.AndroidManifestApplication_memtagMode, -1));

            if (sa.hasValue(R.styleable.AndroidManifestApplication_nativeHeapZeroInitialized)) {

            if (sa.hasValue(R.styleable.AndroidManifestApplication_nativeHeapZeroInitialized)) {

                Boolean v = sa.getBoolean(

                final boolean v = sa.getBoolean(

                        R.styleable.AndroidManifestApplication_nativeHeapZeroInitialized, false);

                        R.styleable.AndroidManifestApplication_nativeHeapZeroInitialized, false);

                pkg.setNativeHeapZeroInitialized(

                pkg.setNativeHeapZeroInitialized(

                        v ? ApplicationInfo.ZEROINIT_ENABLED : ApplicationInfo.ZEROINIT_DISABLED);

                        v ? ApplicationInfo.ZEROINIT_ENABLED : ApplicationInfo.ZEROINIT_DISABLED);
@@ -2677,7 +2678,7 @@ public class ParsingPackageUtils { 
        for (int index = 0; index < activitiesSize; index++) {

        for (int index = 0; index < activitiesSize; index++) {

            ParsedActivity activity = activities.get(index);

            ParsedActivity activity = activities.get(index);

            // If the max aspect ratio for the activity has already been set, skip.

            // If the max aspect ratio for the activity has already been set, skip.

            if (activity.getMaxAspectRatio() != null) {

            if (activity.getMaxAspectRatio() != ASPECT_RATIO_NOT_SET) {

                continue;

                continue;

            }

            }
@@ -2706,7 +2707,7 @@ public class ParsingPackageUtils { 
        int activitiesSize = activities.size();

        int activitiesSize = activities.size();

        for (int index = 0; index < activitiesSize; index++) {

        for (int index = 0; index < activitiesSize; index++) {

            ParsedActivity activity = activities.get(index);

            ParsedActivity activity = activities.get(index);

            if (activity.getMinAspectRatio() == null) {

            if (activity.getMinAspectRatio() == ASPECT_RATIO_NOT_SET) {

                activity.setMinAspectRatio(activity.getResizeMode(), minAspectRatio);

                activity.setMinAspectRatio(activity.getResizeMode(), minAspectRatio);

            }

            }

        }

        }

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,8 @@ public class ParsingUtils { 
    public static final int DEFAULT_MIN_SDK_VERSION = 1;

    public static final int DEFAULT_MIN_SDK_VERSION = 1;

    public static final int DEFAULT_TARGET_SDK_VERSION = 0;

    public static final int DEFAULT_TARGET_SDK_VERSION = 0;





    public static final int NOT_SET = -1;



    @Nullable

    @Nullable

    public static String buildClassName(String pkg, CharSequence clsSeq) {

    public static String buildClassName(String pkg, CharSequence clsSeq) {

        if (clsSeq == null || clsSeq.length() <= 0) {

        if (clsSeq == null || clsSeq.length() <= 0) {

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

+11 −15
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE; 
import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE_VIA_SDK_VERSION;

import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE_VIA_SDK_VERSION;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;

import static android.content.pm.parsing.ParsingPackageImpl.sForInternedString;

import static android.content.pm.parsing.ParsingPackageImpl.sForInternedString;

import static android.content.pm.parsing.ParsingPackageUtils.ASPECT_RATIO_NOT_SET;

import static android.view.WindowManager.LayoutParams.ROTATION_ANIMATION_UNSPECIFIED;

import static android.view.WindowManager.LayoutParams.ROTATION_ANIMATION_UNSPECIFIED;





import android.annotation.NonNull;

import android.annotation.NonNull;
@@ -67,11 +68,8 @@ public class ParsedActivity extends ParsedMainComponent { 
    private int screenOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;

    private int screenOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;

    private int resizeMode = ActivityInfo.RESIZE_MODE_RESIZEABLE;

    private int resizeMode = ActivityInfo.RESIZE_MODE_RESIZEABLE;





    @Nullable

    private float maxAspectRatio = ASPECT_RATIO_NOT_SET;

    private Float maxAspectRatio;

    private float minAspectRatio = ASPECT_RATIO_NOT_SET;



    @Nullable

    private Float minAspectRatio;





    private boolean supportsSizeChanges;

    private boolean supportsSizeChanges;
@@ -234,7 +232,7 @@ public class ParsedActivity extends ParsedMainComponent { 
        return this;

        return this;

    }

    }





    public ParsedActivity setMaxAspectRatio(Float maxAspectRatio) {

    public ParsedActivity setMaxAspectRatio(float maxAspectRatio) {

        this.maxAspectRatio = maxAspectRatio;

        this.maxAspectRatio = maxAspectRatio;

        return this;

        return this;

    }

    }
@@ -260,7 +258,7 @@ public class ParsedActivity extends ParsedMainComponent { 
        return this;

        return this;

    }

    }





    public ParsedActivity setMinAspectRatio(Float minAspectRatio) {

    public ParsedActivity setMinAspectRatio(float minAspectRatio) {

        this.minAspectRatio = minAspectRatio;

        this.minAspectRatio = minAspectRatio;

        return this;

        return this;

    }

    }
@@ -375,8 +373,8 @@ public class ParsedActivity extends ParsedMainComponent { 
        dest.writeInt(this.lockTaskLaunchMode);

        dest.writeInt(this.lockTaskLaunchMode);

        dest.writeInt(this.screenOrientation);

        dest.writeInt(this.screenOrientation);

        dest.writeInt(this.resizeMode);

        dest.writeInt(this.resizeMode);

        dest.writeValue(this.maxAspectRatio);

        dest.writeFloat(this.maxAspectRatio);

        dest.writeValue(this.minAspectRatio);

        dest.writeFloat(this.minAspectRatio);

        dest.writeBoolean(this.supportsSizeChanges);

        dest.writeBoolean(this.supportsSizeChanges);

        dest.writeString(this.requestedVrComponent);

        dest.writeString(this.requestedVrComponent);

        dest.writeInt(this.rotationAnimation);

        dest.writeInt(this.rotationAnimation);
@@ -412,8 +410,8 @@ public class ParsedActivity extends ParsedMainComponent { 
        this.lockTaskLaunchMode = in.readInt();

        this.lockTaskLaunchMode = in.readInt();

        this.screenOrientation = in.readInt();

        this.screenOrientation = in.readInt();

        this.resizeMode = in.readInt();

        this.resizeMode = in.readInt();

        this.maxAspectRatio = (Float) in.readValue(Float.class.getClassLoader());

        this.maxAspectRatio = in.readFloat();

        this.minAspectRatio = (Float) in.readValue(Float.class.getClassLoader());

        this.minAspectRatio = in.readFloat();

        this.supportsSizeChanges = in.readBoolean();

        this.supportsSizeChanges = in.readBoolean();

        this.requestedVrComponent = in.readString();

        this.requestedVrComponent = in.readString();

        this.rotationAnimation = in.readInt();

        this.rotationAnimation = in.readInt();
@@ -505,13 +503,11 @@ public class ParsedActivity extends ParsedMainComponent { 
        return resizeMode;

        return resizeMode;

    }

    }





    @Nullable

    public float getMaxAspectRatio() {

    public Float getMaxAspectRatio() {

        return maxAspectRatio;

        return maxAspectRatio;

    }

    }





    @Nullable

    public float getMinAspectRatio() {

    public Float getMinAspectRatio() {

        return minAspectRatio;

        return minAspectRatio;

    }

    }