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

Commit 0d8acf5a authored by Chia-I Wu's avatar Chia-I Wu
Browse files

Fix widecg and hdr ordering in Configuration 

Wide Gamut qualifier should be before the HDR one.

Bug: 78136980
Test: am get-config
Change-Id: If0f09ddb750d586d29b4cedcbab3d5981f393b92
parent 8cc536c8

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

+10 −10
Original line number Diff line number Diff line
@@ -2072,23 +2072,23 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
                break;

        }



        switch (config.colorMode & Configuration.COLOR_MODE_HDR_MASK) {

            case Configuration.COLOR_MODE_HDR_YES:

                parts.add("highdr");

        switch (config.colorMode & Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_MASK) {

            case Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_YES:

                parts.add("widecg");

                break;

            case Configuration.COLOR_MODE_HDR_NO:

                parts.add("lowdr");

            case Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_NO:

                parts.add("nowidecg");

                break;

            default:

                break;

        }



        switch (config.colorMode & Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_MASK) {

            case Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_YES:

                parts.add("widecg");

        switch (config.colorMode & Configuration.COLOR_MODE_HDR_MASK) {

            case Configuration.COLOR_MODE_HDR_YES:

                parts.add("highdr");

                break;

            case Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_NO:

                parts.add("nowidecg");

            case Configuration.COLOR_MODE_HDR_NO:

                parts.add("lowdr");

                break;

            default:

                break;

libs/androidfw/ResourceTypes.cpp

+14 −14
Original line number Diff line number Diff line
@@ -3205,20 +3205,6 @@ String8 ResTable_config::toString() const { 
                break;

        }

    }

    if ((colorMode&MASK_HDR) != 0) {

        if (res.size() > 0) res.append("-");

        switch (colorMode&MASK_HDR) {

            case ResTable_config::HDR_NO:

                res.append("lowdr");

                break;

            case ResTable_config::HDR_YES:

                res.append("highdr");

                break;

            default:

                res.appendFormat("hdr=%d", dtohs(colorMode&MASK_HDR));

                break;

        }

    }

    if ((colorMode&MASK_WIDE_COLOR_GAMUT) != 0) {

        if (res.size() > 0) res.append("-");

        switch (colorMode&MASK_WIDE_COLOR_GAMUT) {
@@ -3233,6 +3219,20 @@ String8 ResTable_config::toString() const { 
                break;

        }

    }

    if ((colorMode&MASK_HDR) != 0) {

        if (res.size() > 0) res.append("-");

        switch (colorMode&MASK_HDR) {

            case ResTable_config::HDR_NO:

                res.append("lowdr");

                break;

            case ResTable_config::HDR_YES:

                res.append("highdr");

                break;

            default:

                res.appendFormat("hdr=%d", dtohs(colorMode&MASK_HDR));

                break;

        }

    }

    if (orientation != ORIENTATION_ANY) {

        if (res.size() > 0) res.append("-");

        switch (orientation) {