diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-11-02 10:52:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-02 10:52:30 -0800 |
| commit | efb752570e6c318eb1dbd8795408959cf4c5ab9f (patch) | |
| tree | 39da8906a002f1c2a88cab6442d3b09a795157c7 /include | |
| parent | 4b5d8e5ddac4f380e2333afecae7b917b7583e65 (diff) | |
| parent | b6a6791f381691d4a58fe6972eb9f0b65308ac1f (diff) | |
| download | frameworks_base-efb752570e6c318eb1dbd8795408959cf4c5ab9f.zip frameworks_base-efb752570e6c318eb1dbd8795408959cf4c5ab9f.tar.gz frameworks_base-efb752570e6c318eb1dbd8795408959cf4c5ab9f.tar.bz2 | |
am b6a6791f: Merge change I60413727 into eclair
Merge commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f' into eclair-plus-aosp
* commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f':
Fix issue #2226370: Resource versions match with equality
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/ResourceTypes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index 17ccad6..49145e8 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -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 |