Merge change 8262 into donut
* changes:
Implement the device ConfigurationInfo.reqGlEsVersion field.
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 8e4c897..81a715d 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -723,6 +723,11 @@
Configuration mConfiguration = new Configuration();
/**
+ * Hardware-reported OpenGLES version.
+ */
+ final int GL_ES_VERSION;
+
+ /**
* List of initialization arguments to pass to all processes when binding applications to them.
* For example, references to the commonly used services.
*/
@@ -1395,6 +1400,9 @@
mUsageStatsService = new UsageStatsService( new File(
systemDir, "usagestats").toString());
+ GL_ES_VERSION = SystemProperties.getInt("ro.opengles.version",
+ ConfigurationInfo.GL_ES_VERSION_UNDEFINED);
+
mConfiguration.makeDefault();
mProcessStats.init();
@@ -11846,6 +11854,7 @@
&& mConfiguration.keyboard != Configuration.KEYBOARD_NOKEYS) {
config.reqInputFeatures |= ConfigurationInfo.INPUT_FEATURE_HARD_KEYBOARD;
}
+ config.reqGlEsVersion = GL_ES_VERSION;
}
return config;
}