Merge change 8262 into donut (de08cdc0) · Commits · e / os / android_frameworks_base

services/java/com/android/server/am/ActivityManagerService.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -722,6 +722,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.
		@@ -1395,6 +1400,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();

		@@ -11846,6 +11854,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;
		}