Merge change Ieca126e6 into eclair
* changes:
Fix problem with proximity sensor not reawaking screen if the values change too quickly.
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index 00ab7de..1c0ed36 100644
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -54,7 +54,7 @@
// 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;
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 @@
if (version || o.version) {
if ((sdkVersion != o.sdkVersion) && requested->sdkVersion) {
- return (sdkVersion);
+ return (sdkVersion > o.sdkVersion);
}
if ((minorVersion != o.minorVersion) &&
@@ -1384,7 +1384,7 @@
}
if (version != 0) {
if (settings.sdkVersion != 0 && sdkVersion != 0
- && sdkVersion != settings.sdkVersion) {
+ && sdkVersion > settings.sdkVersion) {
return false;
}
if (settings.minorVersion != 0 && minorVersion != 0