Enable ANGLE-for-Android rule processing again (e674a540) · Commits · e / os / android_frameworks_base

core/java/android/os/GraphicsEnvironment.java

+0 −26

Original line number	Diff line number	Diff line
		@@ -352,26 +352,6 @@ public class GraphicsEnvironment {
		return false;
		}

		/**
		* Attempt to setup ANGLE with a (temporary) default rules file: b/121153494
		* True: Rules file was loaded.
		* False: Rules file was not loaded.
		*/
		private boolean setupAngleRulesDebug(String packageName, String paths, String devOptIn) {
		// b/121153494
		// Skip APK rules file checking.
		if (!DEBUG) {
		Log.v(TAG, "Skipping loading the rules file.");
		// Fill in some default values for now, so the loader can get an answer when it asks.
		// Most importantly, we need to indicate which app we are init'ing and what the
		// developer options for it are so we can turn on ANGLE if needed.
		setAngleInfo(paths, packageName, devOptIn, null, 0, 0);
		return true;
		}

		return false;
		}

		/**
		* Attempt to setup ANGLE with a rules file loaded from the ANGLE APK.
		* True: APK rules file was loaded.
		@@ -450,12 +430,6 @@ public class GraphicsEnvironment {
		return;
		}

		// b/121153494
		if (setupAngleRulesDebug(packageName, paths, devOptIn)) {
		// We setup ANGLE with defaults, so we're done here.
		return;
		}

		if (setupAngleRulesApk(anglePkgName, angleInfo, context, packageName, paths, devOptIn)) {
		// We setup ANGLE with rules from the APK, so we're done here.
		return;