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

Commit 12c84b5d authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev

parents e1970346 9086562a

core/java/android/content/res/Configuration.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -1365,9 +1365,9 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
        ArrayList<String> parts = new ArrayList<String>();

        ArrayList<String> parts = new ArrayList<String>();





        if (config.mcc != 0) {

        if (config.mcc != 0) {

            parts.add(config.mcc + "mcc");

            parts.add("mcc" + config.mcc);

            if (config.mnc != 0) {

            if (config.mnc != 0) {

                parts.add(config.mnc + "mnc");

                parts.add("mnc" + config.mnc);

            }

            }

        }

        }

tools/aapt/AaptConfig.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -240,7 +240,9 @@ void applyVersionForCompatibility(ConfigDescription* config) { 
    }

    }





    uint16_t minSdk = 0;

    uint16_t minSdk = 0;

    if (config->smallestScreenWidthDp != ResTable_config::SCREENWIDTH_ANY

    if (config->density == ResTable_config::DENSITY_ANY) {

        minSdk = SDK_L;

    } else if (config->smallestScreenWidthDp != ResTable_config::SCREENWIDTH_ANY

            || config->screenWidthDp != ResTable_config::SCREENWIDTH_ANY

            || config->screenWidthDp != ResTable_config::SCREENWIDTH_ANY

            || config->screenHeightDp != ResTable_config::SCREENHEIGHT_ANY) {

            || config->screenHeightDp != ResTable_config::SCREENHEIGHT_ANY) {

        minSdk = SDK_HONEYCOMB_MR2;

        minSdk = SDK_HONEYCOMB_MR2;
@@ -255,8 +257,6 @@ void applyVersionForCompatibility(ConfigDescription* config) { 
                != ResTable_config::SCREENLONG_ANY

                != ResTable_config::SCREENLONG_ANY

            || config->density != ResTable_config::DENSITY_DEFAULT) {

            || config->density != ResTable_config::DENSITY_DEFAULT) {

        minSdk = SDK_DONUT;

        minSdk = SDK_DONUT;

    } else if ((config->density == ResTable_config::DENSITY_ANY)) {

        minSdk = SDK_L;

    }

    }





    if (minSdk > config->sdkVersion) {

    if (minSdk > config->sdkVersion) {