Fix issue #2226370: Resource versions match with equality

Also fixed turned-around increment of version number for resources. :(

Change-Id: I604137272da984bcd69cee4f174e6b7f2c786e46
This commit is contained in:
Dianne Hackborn 2009-11-01 21:16:59 -08:00 committed by Alex Ray
parent 62b7796351
commit 6b8297700b
1 changed files with 2 additions and 2 deletions

View File

@ -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