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

Commit d62b063f authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am b6a6791f: Merge change I60413727 into eclair 

Merge commit 'b6a6791f' into eclair-mr2

* commit 'b6a6791f':
  Fix issue #2226370: Resource versions match with equality
parents a86861a8 b6a6791f

core/java/android/content/res/Resources.java

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class Resources { 
    // Use the current SDK version code.  If we are a development build,

    // also allow the previous SDK version + 1.

    private static final int sSdkVersion = Build.VERSION.SDK_INT

            + ("REL".equals(Build.VERSION.CODENAME) ? 1 : 0);

            + ("REL".equals(Build.VERSION.CODENAME) ? 0 : 1);

    private static final Object mSync = new Object();

    private static Resources mSystem = null;

include/utils/ResourceTypes.h

+2 −2
Original line number Diff line number Diff line
@@ -1272,7 +1272,7 @@ struct ResTable_config 


            if (version || o.version) {

                if ((sdkVersion != o.sdkVersion) && requested->sdkVersion) {

                    return (sdkVersion);

                    return (sdkVersion > o.sdkVersion);

                }



                if ((minorVersion != o.minorVersion) &&
@@ -1384,7 +1384,7 @@ struct ResTable_config 
        }

        if (version != 0) {

            if (settings.sdkVersion != 0 && sdkVersion != 0

                && sdkVersion != settings.sdkVersion) {

                && sdkVersion > settings.sdkVersion) {

                return false;

            }

            if (settings.minorVersion != 0 && minorVersion != 0