diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-23 13:29:35 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-23 13:29:35 -0700 |
commit | 35d7a94c334076dc66daff9d567139c595011c89 (patch) | |
tree | 35ef6da3588dddfd10b76fcde98af597a799442c /services/java | |
parent | f88c0a0625b136ba26d2e68c692261925a2c9584 (diff) | |
parent | de08cdc0a56ab8d48a226dadef02740520c274b7 (diff) | |
download | frameworks_base-35d7a94c334076dc66daff9d567139c595011c89.zip frameworks_base-35d7a94c334076dc66daff9d567139c595011c89.tar.gz frameworks_base-35d7a94c334076dc66daff9d567139c595011c89.tar.bz2 |
am de08cdc0: Merge change 8262 into donut
Merge commit 'de08cdc0a56ab8d48a226dadef02740520c274b7'
* commit 'de08cdc0a56ab8d48a226dadef02740520c274b7':
Implement the device ConfigurationInfo.reqGlEsVersion field.
Diffstat (limited to 'services/java')
-rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 7d4a2c2..8a4b8f9 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -729,6 +729,11 @@ public final class ActivityManagerService extends ActivityManagerNative implemen 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. */ @@ -1401,6 +1406,9 @@ public final class ActivityManagerService extends ActivityManagerNative implemen 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(); @@ -11888,6 +11896,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen && mConfiguration.keyboard != Configuration.KEYBOARD_NOKEYS) { config.reqInputFeatures |= ConfigurationInfo.INPUT_FEATURE_HARD_KEYBOARD; } + config.reqGlEsVersion = GL_ES_VERSION; } return config; } |