drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I60413727 into eclair

Browse Source 
* changes:
  Fix issue #2226370: Resource versions match with equality
This commit is contained in:
Android (Google) Code Review
2009-11-02 13:43:52 -05:00
parent 31f62008db 553399518f
commit b6a6791f38
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/res/Resources.java
View File

@ -54,7 +54,7 @@ public class Resources {
// Use the current SDK version code. If we are a development build, // Use the current SDK version code. If we are a development build,
// also allow the previous SDK version + 1. // also allow the previous SDK version + 1.
private static final int sSdkVersion = Build.VERSION.SDK_INT 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 final Object mSync = new Object();
private static Resources mSystem = null; private static Resources mSystem = null;

4
include/utils/ResourceTypes.h
View File

@ -1272,7 +1272,7 @@ struct ResTable_config
if (version || o.version) { if (version || o.version) {
if ((sdkVersion != o.sdkVersion) && requested->sdkVersion) { if ((sdkVersion != o.sdkVersion) && requested->sdkVersion) {
return (sdkVersion); return (sdkVersion > o.sdkVersion);
} }
if ((minorVersion != o.minorVersion) && if ((minorVersion != o.minorVersion) &&
@ -1384,7 +1384,7 @@ struct ResTable_config
} }
if (version != 0) { if (version != 0) {
if (settings.sdkVersion != 0 && sdkVersion != 0 if (settings.sdkVersion != 0 && sdkVersion != 0
&& sdkVersion != settings.sdkVersion) { && sdkVersion > settings.sdkVersion) {
return false; return false;
} }
if (settings.minorVersion != 0 && minorVersion != 0 if (settings.minorVersion != 0 && minorVersion != 0