Merge changes from topic "no_layers_profileable" into qt-dev (fc16afca) · Commits · e / os / android_frameworks_base

core/java/android/os/GraphicsEnvironment.java

+3 −11

Original line number	Diff line number	Diff line
		@@ -230,13 +230,6 @@ public class GraphicsEnvironment {
		return (context.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) > 0;
		}

		/**
		* Check whether application is profileable
		*/
		private static boolean isProfileable(Context context) {
		return context.getApplicationInfo().isProfileableByShell();
		}

		/**
		* Store the layer paths available to the loader.
		*/
		@@ -287,11 +280,11 @@ public class GraphicsEnvironment {
		String layerPaths = "";

		// Only enable additional debug functionality if the following conditions are met:
		// 1. App is debuggable, profileable, or device is rooted
		// 1. App is debuggable or device is rooted
		// 2. ENABLE_GPU_DEBUG_LAYERS is true
		// 3. Package name is equal to GPU_DEBUG_APP

		if (isDebuggable(context) \|\| isProfileable(context) \|\| (getCanLoadSystemLibraries() == 1)) {
		if (isDebuggable(context) \|\| (getCanLoadSystemLibraries() == 1)) {

		final int enable = coreSettings.getInt(Settings.Global.ENABLE_GPU_DEBUG_LAYERS, 0);

		@@ -473,9 +466,8 @@ public class GraphicsEnvironment {
		*/
		private String getAngleDebugPackage(Context context, Bundle coreSettings) {
		final boolean appIsDebuggable = isDebuggable(context);
		final boolean appIsProfileable = isProfileable(context);
		final boolean deviceIsDebuggable = getCanLoadSystemLibraries() == 1;
		if (appIsDebuggable \|\| appIsProfileable \|\| deviceIsDebuggable) {
		if (appIsDebuggable \|\| deviceIsDebuggable) {
		String debugPackage;

		if (coreSettings != null) {