From 32adba453789b2e7f274302e40af30d1f81aca0c Mon Sep 17 00:00:00 2001
From: Cody Northrop <cnorthrop@google.com>
Date: Tue, 28 May 2019 12:18:44 -0600
Subject: [PATCH] GraphicsEnvironment: No debug ANGLE packages for profileable
 apps

An app opting in to "profileable" does not mean we should
allow it to load ANGLE libraries from the debug package.

Bug: 128637647
Test: atest CtsGpuToolsHostTestCases
Change-Id: I5c6ea33a1e1624e006bc4865bc0a06ea92d9d806
---
 core/java/android/os/GraphicsEnvironment.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java
index 21701346c97c3..24a1477836690 100644
--- a/core/java/android/os/GraphicsEnvironment.java
+++ b/core/java/android/os/GraphicsEnvironment.java
@@ -466,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) {