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

Commit ff9ce0f6 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Fixed logic error with setting maxAspectRatio"

parents b29e0db8 0cb70ac4

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

+6 −2
Original line number Diff line number Diff line
@@ -4400,8 +4400,12 @@ public class PackageParser { 
            defaultMaxAspectRatio = owner.applicationInfo.maxAspectRatio;

        }



        aInfo.maxAspectRatio = Math.max(1.0f, sa.getFloat(

                R.styleable.AndroidManifestActivity_maxAspectRatio, defaultMaxAspectRatio));

        aInfo.maxAspectRatio = sa.getFloat(

                R.styleable.AndroidManifestActivity_maxAspectRatio, defaultMaxAspectRatio);

        if (aInfo.maxAspectRatio < 1.0f && aInfo.maxAspectRatio != 0) {

            // Ignore any value lesser than 1.0.

            aInfo.maxAspectRatio = 0;

        }

    }



    /**